move two declarative language files

to folder `declaratives`

Signed-off-by: Qingpeng Li <qingpeng9802@gmail.com>

Author: qingpeng9802

.vscodeignore

@@ -13,8 +13,8 @@
 !syntaxes/commonlisp.tmLanguage.json
 !syntaxes/cl_codeblock.tmLanguage.json
 
-!language-configuration.json
-!snippets/commonlisp_snippets.json
+!declaratives/language-configuration.json
+!declaratives/commonlisp_snippets.json
 
 !README.md
 !CHANGELOG.md

CONTRIBUTING.md

@@ -138,9 +138,9 @@ The recommended workflow is:
 4. If the changes are what you expect, run `npm run accept` to accept the new baselines.
 
 ### Snippet
-In `./snippets`.
+In `./declaratives/commonlisp_snippets.json`.
 See [Snippet Guide](https://code.visualstudio.com/api/language-extensions/snippet-guide) and [creating-your-own-snippets](https://code.visualstudio.com/docs/editor/userdefinedsnippets#_creating-your-own-snippets).
 
 ### Language Configuration
-In `./language-configuration.json`.
+In `./declaratives/language-configuration.json`.
 See [Language Configuration Guide](https://code.visualstudio.com/api/language-extensions/language-configuration-guide).

snippets/commonlisp_snippets.json declaratives/commonlisp_snippets.jsonsnippets/commonlisp_snippets.json renamed to declaratives/commonlisp_snippets.json

@@ -1,34 +1,34 @@
-{
-    "comments": {
-        // symbol used for single line comment. Remove this entry if your language does not support line comments
-        "lineComment": ";",
-        // symbols used for start and end a block comment. Remove this entry if your language does not support block comments
-        "blockComment": [ "#|", "|#" ]
-    },
-    // symbols used as brackets
-    "brackets": [
-        [ "{", "}" ],
-        [ "[", "]" ],
-        [ "(", ")" ]
-    ],
-    // symbols that are auto closed when typing
-    "autoClosingPairs": [
-        [ "{", "}" ],
-        [ "[", "]" ],
-        [ "(", ")" ],
-        [ "\"", "\"" ],
-        [ "#|", " |#" ]
-    ],
-    // symbols that can be used to surround a selection
-    "surroundingPairs": [
-        [ "{", "}" ],
-        [ "[", "]" ],
-        [ "(", ")" ],
-        [ "\"", "\"" ],
-    ],
-    // wordPattern defines what's considered as a word in the programming language.
-    // Code suggestion features will use this setting to determine word boundaries if wordPattern is set. 
-    // Note this setting won't affect word-related editor commands, 
-    // which are controlled by the editor setting editor.wordSeparators.
-    "wordPattern": "([#:A-Za-z0-9\\+\\-\\*\\/\\@\\$\\%\\^\\&\\_\\=\\<\\>\\~\\!\\?\\[\\]\\{\\}\\.]+)"
-}
+{
+    "comments": {
+        // symbol used for single line comment. Remove this entry if your language does not support line comments
+        "lineComment": ";",
+        // symbols used for start and end a block comment. Remove this entry if your language does not support block comments
+        "blockComment": [ "#|", "|#" ]
+    },
+    // symbols used as brackets
+    "brackets": [
+        [ "{", "}" ],
+        [ "[", "]" ],
+        [ "(", ")" ]
+    ],
+    // symbols that are auto closed when typing
+    "autoClosingPairs": [
+        [ "{", "}" ],
+        [ "[", "]" ],
+        [ "(", ")" ],
+        [ "\"", "\"" ],
+        [ "#|", " |#" ]
+    ],
+    // symbols that can be used to surround a selection
+    "surroundingPairs": [
+        [ "{", "}" ],
+        [ "[", "]" ],
+        [ "(", ")" ],
+        [ "\"", "\"" ],
+    ],
+    // wordPattern defines what's considered as a word in the programming language.
+    // Code suggestion features will use this setting to determine word boundaries if wordPattern is set. 
+    // Note this setting won't affect word-related editor commands, 
+    // which are controlled by the editor setting editor.wordSeparators.
+    "wordPattern": "([#:A-Za-z0-9\\+\\-\\*\\/\\@\\$\\%\\^\\&\\_\\=\\<\\>\\~\\!\\?\\[\\]\\{\\}\\.]+)"
+}

language-configuration.json declaratives/language-configuration.jsonlanguage-configuration.json renamed to declaratives/language-configuration.json

@@ -49,7 +49,7 @@
                     ".asd",
                     ".asdf"
                 ],
-                "configuration": "./language-configuration.json",
+                "configuration": "./declaratives/language-configuration.json",
                 "icon": {
                     "light": "./images/commonlisp_file_icon.svg",
                     "dark": "./images/commonlisp_file_icon.svg"
@@ -83,7 +83,7 @@
         "snippets": [
             {
                 "language": "commonlisp",
-                "path": "./snippets/commonlisp_snippets.json"
+                "path": "./declaratives/commonlisp_snippets.json"
             }
         ],
         "configuration": {

package.json

@@ -4,10 +4,11 @@ import { promises as fsPromises } from 'fs';
 
 import { load } from 'js-yaml';
 
-const INPUT_GRAM_PATH = 'syntaxes/commonlisp.yaml';
-const OUTPUT_GRAM_PATH = 'syntaxes/commonlisp.tmLanguage.json';
-const INPUT_INJMD_GRAM_PATH = 'syntaxes/cl_codeblock.yaml';
-const OUTPUT_INJMD_GRAM_PATH = 'syntaxes/cl_codeblock.tmLanguage.json';
+const syntaxes_root = 'syntaxes/';
+const INPUT_GRAM_PATH = `${syntaxes_root}commonlisp.yaml`;
+const OUTPUT_GRAM_PATH = `${syntaxes_root}commonlisp.tmLanguage.json`;
+const INPUT_INJMD_GRAM_PATH = `${syntaxes_root}cl_codeblock.yaml`;
+const OUTPUT_INJMD_GRAM_PATH = `${syntaxes_root}cl_codeblock.tmLanguage.json`;
 
 /**
  * @param {string} inputFilePath

syntaxes/scripts/build_grammar.mjs

@@ -38,8 +38,9 @@ var GrammarScopeName;
 const grammarFileNames = new Map([
     [GrammarScopeName.lisp, 'commonlisp.tmLanguage.json']
 ]);
+const syntaxes_root = './syntaxes/';
 /** get the path of the grammar file */
-const getGrammarPath = (scopeName) => path.join('./syntaxes', grammarFileNames.get(scopeName));
+const getGrammarPath = (scopeName) => path.join(syntaxes_root, grammarFileNames.get(scopeName));
 // Part 2: get vscode-textmate registry
 /** get vscode-textmate registry */
 async function getRegistery() {
@@ -96,7 +97,7 @@ function generateScopesWorker(mainGrammar, oriLineArr) {
     for (const oriLine of oriLineArr) {
         // console.log(`\nTokenizing line: ${oriLine}`);
         cleanCodeLines.push(oriLine);
-        recordLines.push('>' + oriLine);
+        recordLines.push(`>${oriLine}`);
         let prevScope = '';
         const mainLineTokens = tokenizeLine(mainGrammar, oriLine);
         for (const token of mainLineTokens) {

syntaxes/scripts/gen_record.mjs

@@ -42,9 +42,10 @@ enum GrammarScopeName {
 const grammarFileNames: Map<GrammarScopeName, string> = new Map([
   [GrammarScopeName.lisp, 'commonlisp.tmLanguage.json']
 ]);
+const syntaxes_root = './syntaxes/';
 /** get the path of the grammar file */
 const getGrammarPath = (scopeName: GrammarScopeName) =>
-  path.join('./syntaxes', grammarFileNames.get(scopeName)!);
+  path.join(syntaxes_root, grammarFileNames.get(scopeName)!);
 
 // Part 2: get vscode-textmate registry
 

syntaxes/scripts/gen_record.mts

@@ -5,9 +5,10 @@ import * as path from 'path';
 
 import { generateScopes, getRegistery, GrammarScopeName } from './gen_record.mjs';
 
-const generatedFolder = 'syntaxes/test/generated';
-const baselineFolder = 'syntaxes/test/baselines';
-const casesFolder = 'syntaxes/test/cases';
+const syntaxes_root = 'syntaxes/';
+const generatedFolder = `${syntaxes_root}test/generated`;
+const baselineFolder = `${syntaxes_root}test/baselines`;
+const casesFolder = `${syntaxes_root}test/cases`;
 
 /**
  * @param {string} file