update builder

Author: sumneko

build/build.js

@@ -10,52 +10,12 @@ function readJson(fileName) {
     var text = fs.readFileSync(fileName, "utf8");
     return JSON.parse(text);
 }
-function transformGrammarRule(rule, propertyNames, transformProperty) {
-    for (var _i = 0, propertyNames_1 = propertyNames; _i < propertyNames_1.length; _i++) {
-        var propertyName_1 = propertyNames_1[_i];
-        var value = rule[propertyName_1];
-        if (typeof value === 'string') {
-            rule[propertyName_1] = transformProperty(value);
-        }
-    }
-    for (var propertyName in rule) {
-        var value = rule[propertyName];
-        if (typeof value === 'object') {
-            transformGrammarRule(value, propertyNames, transformProperty);
-        }
-    }
-}
-function transformGrammarRepository(grammar, propertyNames, transformProperty) {
-    var repository = grammar.repository;
-    for (var key in repository) {
-        transformGrammarRule(repository[key], propertyNames, transformProperty);
-    }
-}
-function getLuaGrammar(getVariables) {
-    var luaGrammarBeforeTransformation = readJson('lua.tmLanguage.json');
-    return updateGrammarVariables(luaGrammarBeforeTransformation, getVariables(luaGrammarBeforeTransformation.variables));
-}
-function replacePatternVariables(pattern, variableReplacers) {
-    var result = pattern;
-    for (var _i = 0, variableReplacers_1 = variableReplacers; _i < variableReplacers_1.length; _i++) {
-        var _a = variableReplacers_1[_i], variableName = _a[0], value = _a[1];
-        result = result.replace(variableName, value);
-    }
-    return result;
-}
-function updateGrammarVariables(grammar, variables) {
-    delete grammar.variables;
-    var variableReplacers = [];
-    for (var variableName in variables) {
-        // Replace the pattern with earlier variables
-        var pattern = replacePatternVariables(variables[variableName], variableReplacers);
-        variableReplacers.push([new RegExp("{{" + variableName + "}}", "gim"), pattern]);
-    }
-    transformGrammarRepository(grammar, ["begin", "end", "match"], function (pattern) { return replacePatternVariables(pattern, variableReplacers); });
-    return grammar;
+function getLuaGrammar() {
+    var luaGrammar = readJson('lua.tmLanguage.json');
+    return luaGrammar;
 }
 function buildGrammar() {
-    var luaGrammar = getLuaGrammar(function (grammarVariables) { return grammarVariables; });
+    var luaGrammar = getLuaGrammar();
     // Write TypeScript.tmLanguage
     writePlistFile(luaGrammar, 'Syntaxes/Lua.plist');
 }

build/build.ts

@@ -11,61 +11,13 @@ function readJson(fileName: string) {
     return JSON.parse(text);
 }
 
-function transformGrammarRule(rule: any, propertyNames: string[], transformProperty: (ruleProperty: string) => string) {
-    for (const propertyName of propertyNames) {
-        const value = rule[propertyName];
-        if (typeof value === 'string') {
-            rule[propertyName] = transformProperty(value);
-        }
-    }
-
-    for (var propertyName in rule) {
-        const value = rule[propertyName];
-        if (typeof value === 'object') {
-            transformGrammarRule(value, propertyNames, transformProperty);
-        }
-    }
-}
-
-function transformGrammarRepository(grammar: TmGrammar, propertyNames: string[], transformProperty: (ruleProperty: string) => string) {
-    const repository = grammar.repository;
-    for (let key in repository) {
-        transformGrammarRule(repository[key], propertyNames, transformProperty);
-    }
-}
-
-function getLuaGrammar(getVariables: (luaGrammarVariables: MapLike<string>) => MapLike<string>) {
-    const luaGrammarBeforeTransformation = readJson('lua.tmLanguage.json') as TmGrammar;
-    return updateGrammarVariables(luaGrammarBeforeTransformation, getVariables(luaGrammarBeforeTransformation.variables as MapLike<string>));
-}
-
-function replacePatternVariables(pattern: string, variableReplacers: VariableReplacer[]) {
-    let result = pattern;
-    for (const [variableName, value] of variableReplacers) {
-        result = result.replace(variableName, value);
-    }
-    return result;
-}
-
-type VariableReplacer = [RegExp, string];
-function updateGrammarVariables(grammar: TmGrammar, variables: MapLike<string>) {
-    delete grammar.variables;
-    const variableReplacers: VariableReplacer[] = [];
-    for (const variableName in variables) {
-        // Replace the pattern with earlier variables
-        const pattern = replacePatternVariables(variables[variableName], variableReplacers);
-        variableReplacers.push([new RegExp(`{{${variableName}}}`, "gim"), pattern]);
-    }
-    transformGrammarRepository(
-        grammar,
-        ["begin", "end", "match"],
-        pattern => replacePatternVariables(pattern, variableReplacers)
-    );
-    return grammar;
+function getLuaGrammar() {
+    const luaGrammar = readJson('lua.tmLanguage.json') as TmGrammar;
+    return luaGrammar;
 }
 
 function buildGrammar() {
-    const luaGrammar = getLuaGrammar(grammarVariables => grammarVariables);
+    const luaGrammar = getLuaGrammar();
 
     // Write TypeScript.tmLanguage
     writePlistFile(luaGrammar, 'Syntaxes/Lua.plist');