オブファスケーター：ユーザー関数のインライン展開対応分をVSCE側に反映

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## Version 0.4.0(BETA2)
+
+- Obfuscator(BETA)
+
+    Added: inline function
+
+    Default is OFF. If you try, turn on vscode preference **"ksp.obfuscator.inline.function"**
+
 ## Version 0.4.0(BETA1)
 
 **Fixed(Provisional)**

package.json

@@ -2,7 +2,7 @@
     "name": "ksp",
     "displayName": "KONTAKT Script Processor (KSP)",
     "description": "Language support for NI KONTAKT Script Processor (KSP)",
-    "version": "0.4.0-beta1",
+    "version": "0.4.0-beta2",
     "publisher": "rkoubou",
     "license": "MIT",
     "keywords": [
@@ -116,6 +116,11 @@
                     "type": "string",
                     "default": ".out.txt",
                     "description": "%configuration.obfuscator.suffix%"
+                },
+                "ksp.obfuscator.inline.function": {
+                    "type": "boolean",
+                    "default": false,
+                    "description": "%configuration.obfuscator.inline.function%"
                 }
             }
         },

package.nls.ja.json

@@ -8,6 +8,7 @@
 	"configuration.validate.unused": "true の場合、パーサーは未使用変数と未使用のユーザー関数を検知します (ksp.validate.syntax.only=falseの場合のみ有効)",
     "configuration.java.location": "javaコマンドの場所。デフォルトでは環境変数PATHに通しているものとして動作します。",
     "configuration.obfuscator.suffix": "コマンドパレットでオブファスケーターを実行することによって生成される、デフォルトのファイル拡張子",
+    "configuration.obfuscator.inline.function": "true の場合、オブファスケーター実行時に全てのユーザー定義関数をインライン展開します",
 
     "command.obfuscate": "NI KSP: オブファスケーターの実行"
 

package.nls.json

@@ -8,6 +8,7 @@
 	"configuration.validate.strict": "If true, parser will be 'strict' mode. (Require:ksp.validate.syntax.only=false)",
 	"configuration.validate.unused": "If true, parser will detect unused variables, user functions. (Require:ksp.validate.syntax.only=false)",
     "configuration.obfuscator.suffix": "Default file suffix which generate by Obfuscator from command palette",
+    "configuration.obfuscator.inline.function": "If true, all user defined functions will be expanded (=inline expansion) when run Obfuscator",
 
     "command.obfuscate": "NI KSP: Run Obfuscator"
 }

src/features/KSPConfigurationConstants.ts

@@ -21,6 +21,7 @@ export const KEY_PARSE_STRICT               = 'validate.strict';
 export const KEY_PARSE_UNUSED               = 'validate.unused';
 // Obfuscator
 export const KEY_OBFUSCATOR_SUFFIX          = 'obfuscator.suffix';
+export const KEY_OBFUSCATOR_INLINE_FUNCTION = 'obfuscator.inline.function';
 
 export const DEFAULT_JAVA_LOCATION          = 'java';
 export const DEFAULT_ENABLE_VALIDATE        = false;
@@ -30,3 +31,4 @@ export const DEFAULT_PARSE_SYNTAX_ONLY      = false;
 export const DEFAULT_PARSE_STRICT           = false;
 export const DEFAULT_PARSE_UNUSED           = false;
 export const DEFAULT_OBFUSCATOR_SUFFIX      = '.out.txt';
+export const DEFAULT_INLINE_FUNCTION        = false

src/features/KSPObfuscatorCommand.ts

@@ -58,6 +58,12 @@ export function doObfuscate( context: vscode.ExtensionContext )
     // Run Obfuscator
     //--------------------------------------------------------------------------
     function obfuscate( output:string ){
+
+        let inline: boolean = config.DEFAULT_INLINE_FUNCTION;
+        KSPConfigurationManager.getConfig<boolean>( config.KEY_OBFUSCATOR_INLINE_FUNCTION, config.DEFAULT_INLINE_FUNCTION, (v, user) =>{
+            inline = v;
+        });
+
         // java -Dkspparser.stdout.encoding=UTF-8 -Dkspparser.datadir=path/to/data -jar kspsyntaxparser.jar <document.fileName>
         args.push( "-Dkspparser.stdout.encoding=UTF-8" )
         args.push( "-Dkspparser.datadir=" + thisExtentionDir + "/kspparser/data" )
@@ -68,10 +74,13 @@ export function doObfuscate( context: vscode.ExtensionContext )
         args.push( thisExtentionDir + "/kspparser/KSPSyntaxParser.jar" );
         args.push( "--strict" );
         args.push( "--obfuscate" );
-        args.push( "--source" );
-        args.push( textDocument.fileName );
+        if( inline )
+        {
+            args.push( "--inline-userfunction" )
+        }
         args.push( "--output" );
         args.push( output );
+        args.push( textDocument.fileName );
 
         try
         {

src/features/KSPValidationProvider.ts

@@ -325,7 +325,6 @@ export class KSPValidationProvider
             {
                 args.push( "--unused" );
             }
-            args.push( "--source" );
             args.push( src );
 
             try