fix: Do not late bind parsers (#3175)

Late binding of parsers is creating an issue with the config loader. This will be fixed later, since late binding is the desired behavior.
streetsidesoftware · Jul 1, 2022 · d71607c · d71607c
1 parent e777f6e
commit d71607c
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 44 deletions.
diff --git a/packages/cspell-bundled-dicts/cspell-default.config.js b/packages/cspell-bundled-dicts/cspell-default.config.js
@@ -1,5 +1,4 @@
 "use strict";
-const index_js_1 = require("cspell-grammar/parsers/typescript/index.js");
 const settings = {
     version: '0.2',
     name: 'cspell default settings .js',
@@ -134,10 +133,5 @@ const settings = {
         '@cspell/dict-typescript/cspell-ext.json',
         '@cspell/dict-vue/cspell-ext.json',
     ],
-    plugins: [
-        {
-            parsers: [index_js_1.parser],
-        },
-    ],
 };
 module.exports = settings;
diff --git a/packages/cspell-bundled-dicts/cspell-default.config.ts b/packages/cspell-bundled-dicts/cspell-default.config.ts
@@ -1,7 +1,4 @@
-/* eslint-disable node/no-missing-import */
-/* eslint-disable import/no-unresolved */
 import type { AdvancedCSpellSettings } from '@cspell/cspell-types';
-import { parser as parserTypeScript } from 'cspell-grammar/parsers/typescript/index.js';
 
 const settings: AdvancedCSpellSettings = {
     version: '0.2',
@@ -138,11 +135,6 @@ const settings: AdvancedCSpellSettings = {
         '@cspell/dict-typescript/cspell-ext.json',
         '@cspell/dict-vue/cspell-ext.json',
     ],
-    plugins: [
-        {
-            parsers: [parserTypeScript],
-        },
-    ],
 };
 
 export = settings;
diff --git a/packages/cspell-bundled-dicts/package-lock.json b/packages/cspell-bundled-dicts/package-lock.json
diff --git a/packages/cspell-bundled-dicts/package.json b/packages/cspell-bundled-dicts/package.json
@@ -83,8 +83,7 @@
     "@cspell/dict-software-terms": "^2.1.9",
     "@cspell/dict-swift": "^1.0.3",
     "@cspell/dict-typescript": "^2.0.0",
-    "@cspell/dict-vue": "^2.0.2",
-    "cspell-grammar": "^6.2.1"
+    "@cspell/dict-vue": "^2.0.2"
   },
   "engines": {
     "node": ">=14"

diff --git a/packages/cspell-grammar/src/index.ts b/packages/cspell-grammar/src/index.ts
@@ -1,2 +1,3 @@
 export { compileGrammar, tokenizeLine, tokenizeText } from './parser';
 export type { Grammar, GrammarDef, Pattern, Repository } from './parser';
+export { parsers } from './parsers';
diff --git a/packages/cspell-grammar/src/parsers/index.ts b/packages/cspell-grammar/src/parsers/index.ts
@@ -0,0 +1,2 @@
+import { parser as parserTypeScript } from './typescript';
+export const parsers = [parserTypeScript];
diff --git a/packages/cspell-lib/package-lock.json b/packages/cspell-lib/package-lock.json
diff --git a/packages/cspell-lib/package.json b/packages/cspell-lib/package.json
@@ -56,6 +56,7 @@
     "configstore": "^5.0.1",
     "cosmiconfig": "^7.0.1",
     "cspell-glob": "^6.2.0",
+    "cspell-grammar": "^6.2.1",
     "cspell-io": "^6.2.0",
     "cspell-trie-lib": "^6.2.1",
     "fast-equals": "^4.0.1",

diff --git a/packages/cspell-lib/src/Settings/DefaultSettings.ts b/packages/cspell-lib/src/Settings/DefaultSettings.ts
@@ -1,4 +1,5 @@
 import type { PredefinedPatterns, RegExpPatternDefinition } from '@cspell/cspell-types';
+import { parsers } from 'cspell-grammar';
 import { createCSpellSettingsInternal, CSpellSettingsInternal } from '../Models/CSpellSettingsInternalDef';
 import { PatternRegExp } from '../Models/PatternRegExp';
 import { resolveFile } from '../util/resolveFile';
@@ -103,6 +104,7 @@ export const _defaultSettingsBasis: Readonly<CSpellSettingsInternal> = Object.fr
         languageSettings: [],
         source: { name: 'defaultSettings' },
         reporters: [],
+        plugins: [{ parsers }],
     })
 );