@astrojs/language-server 2.14.0 → 2.14.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. package/dist/check.js +5 -3
  2. package/dist/core/frontmatterHolders.js +1 -1
  3. package/dist/nodeServer.js +3 -3
  4. package/dist/plugins/astro.js +5 -2
  5. package/dist/plugins/typescript/index.js +2 -2
  6. package/package.json +15 -15
package/dist/check.js CHANGED
@@ -36,6 +36,7 @@ const language_server_1 = require("@volar/language-server");
36
36
  Object.defineProperty(exports, "Diagnostic", { enumerable: true, get: function () { return language_server_1.Diagnostic; } });
37
37
  Object.defineProperty(exports, "DiagnosticSeverity", { enumerable: true, get: function () { return language_server_1.DiagnosticSeverity; } });
38
38
  const fast_glob_1 = __importDefault(require("fast-glob"));
39
+ const vscode_uri_1 = require("vscode-uri");
39
40
  const index_js_1 = require("./core/index.js");
40
41
  const svelte_js_1 = require("./core/svelte.js");
41
42
  const vue_js_1 = require("./core/vue.js");
@@ -56,7 +57,7 @@ class AstroCheck {
56
57
  * @return {CheckResult} The result of the lint, including a list of errors, the file's content and its file path.
57
58
  */
58
59
  async lint({ fileNames = undefined, cancel = () => false, logErrors = undefined, }) {
59
- let files = (fileNames !== undefined ? fileNames : this.linter.projectHost.getScriptFileNames()).filter((file) => {
60
+ let files = (fileNames !== undefined ? fileNames : this.linter.getRootFileNames()).filter((file) => {
60
61
  // We don't have the same understanding of Svelte and Vue files as their own respective tools (vue-tsc, svelte-check)
61
62
  // So we don't want to check them here
62
63
  return !file.endsWith('.vue') && !file.endsWith('.svelte');
@@ -92,7 +93,7 @@ class AstroCheck {
92
93
  if (logErrors !== undefined && errorText) {
93
94
  console.info(errorText);
94
95
  }
95
- const fileSnapshot = this.linter.projectHost.getScriptSnapshot(file);
96
+ const fileSnapshot = this.linter.language.scripts.get(vscode_uri_1.URI.file(file))?.snapshot;
96
97
  const fileContent = fileSnapshot?.getText(0, fileSnapshot.getLength());
97
98
  result.fileResult.push({
98
99
  errors: fileDiagnostics,
@@ -120,7 +121,8 @@ class AstroCheck {
120
121
  ];
121
122
  const services = [...(0, index_js_2.create)(this.ts), (0, astro_js_1.create)(this.ts)];
122
123
  if (tsconfigPath) {
123
- this.linter = kit.createTypeScriptChecker(languagePlugins, services, tsconfigPath);
124
+ const includeProjectReference = false; // #920
125
+ this.linter = kit.createTypeScriptChecker(languagePlugins, services, tsconfigPath, includeProjectReference);
124
126
  }
125
127
  else {
126
128
  this.linter = kit.createTypeScriptInferredChecker(languagePlugins, services, () => {
package/dist/core/frontmatterHolders.js CHANGED
@@ -4,7 +4,7 @@ exports.FrontmatterHolder = exports.frontmatterRE = exports.SUPPORTED_FRONTMATTE
4
4
  exports.getFrontmatterLanguagePlugin = getFrontmatterLanguagePlugin;
5
5
  const yaml2ts_1 = require("@astrojs/yaml2ts");
6
6
  const language_core_1 = require("@volar/language-core");
7
- exports.SUPPORTED_FRONTMATTER_EXTENSIONS = { md: 'markdown', mdx: 'mdx', mdoc: 'mdoc' };
7
+ exports.SUPPORTED_FRONTMATTER_EXTENSIONS = { md: 'markdown', mdx: 'mdx', mdoc: 'markdoc' };
8
8
  exports.SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS = Object.keys(exports.SUPPORTED_FRONTMATTER_EXTENSIONS);
9
9
  const SUPPORTED_FRONTMATTER_EXTENSIONS_VALUES = Object.values(exports.SUPPORTED_FRONTMATTER_EXTENSIONS);
10
10
  exports.frontmatterRE = /^---(.*?)^---/ms;
package/dist/nodeServer.js CHANGED
@@ -23,7 +23,7 @@ connection.onInitialize((params) => {
23
23
  collectionConfigs = folders.flatMap((folder) => {
24
24
  try {
25
25
  const folderUri = vscode_uri_1.URI.parse(folder.uri);
26
- let config = server.fs.readFile(vscode_uri_1.Utils.joinPath(folderUri, '.astro/collections/collections.json'));
26
+ let config = server.fileSystem.readFile(vscode_uri_1.Utils.joinPath(folderUri, '.astro/collections/collections.json'));
27
27
  if (!config) {
28
28
  return [];
29
29
  }
@@ -44,7 +44,7 @@ connection.onInitialize((params) => {
44
44
  languagePlugins: (0, languageServerPlugin_js_1.getLanguagePlugins)(connection, typescript, env, configFileName, collectionConfigs),
45
45
  setup() { },
46
46
  };
47
- }), (0, languageServerPlugin_js_1.getLanguageServicePlugins)(connection, typescript, collectionConfigs), { pullModelDiagnostics: params.initializationOptions?.pullModelDiagnostics });
47
+ }), (0, languageServerPlugin_js_1.getLanguageServicePlugins)(connection, typescript, collectionConfigs));
48
48
  });
49
49
  connection.onInitialized(() => {
50
50
  server.initialized();
@@ -65,6 +65,6 @@ connection.onInitialized(() => {
65
65
  if (contentIntellisenseEnabled) {
66
66
  extensions.push(...frontmatterHolders_js_1.SUPPORTED_FRONTMATTER_EXTENSIONS_KEYS);
67
67
  }
68
- server.watchFiles([`**/*.{${extensions.join(',')}}`]);
68
+ server.fileWatcher.watchFiles([`**/*.{${extensions.join(',')}}`]);
69
69
  });
70
70
  //# sourceMappingURL=nodeServer.js.map
package/dist/plugins/astro.js CHANGED
@@ -16,7 +16,10 @@ const create = (ts) => {
16
16
  completionProvider: {
17
17
  triggerCharacters: ['-'],
18
18
  },
19
- diagnosticProvider: {},
19
+ diagnosticProvider: {
20
+ interFileDependencies: false,
21
+ workspaceDiagnostics: false,
22
+ },
20
23
  codeLensProvider: {},
21
24
  },
22
25
  create(context) {
@@ -40,7 +43,7 @@ const create = (ts) => {
40
43
  items: items,
41
44
  };
42
45
  },
43
- provideSemanticDiagnostics(document, token) {
46
+ provideDiagnostics(document, token) {
44
47
  if (token.isCancellationRequested)
45
48
  return [];
46
49
  const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
package/dist/plugins/typescript/index.js CHANGED
@@ -41,7 +41,7 @@ const create = (ts) => {
41
41
  return codeAction;
42
42
  return (0, codeActions_js_1.enhancedResolveCodeAction)(resolvedCodeAction, context);
43
43
  },
44
- async provideSemanticDiagnostics(document, token) {
44
+ async provideDiagnostics(document, token) {
45
45
  const decoded = context.decodeEmbeddedDocumentUri(vscode_uri_1.URI.parse(document.uri));
46
46
  const sourceScript = decoded && context.language.scripts.get(decoded[0]);
47
47
  const root = sourceScript?.generated?.root;
@@ -53,7 +53,7 @@ const create = (ts) => {
53
53
  // We'll use this to filter out diagnostics that are outside the mapped range of the TSX
54
54
  tsxLineCount = root.astroMeta.tsxRanges.body.end.line;
55
55
  }
56
- const diagnostics = await typeScriptPlugin.provideSemanticDiagnostics(document, token);
56
+ const diagnostics = await typeScriptPlugin.provideDiagnostics(document, token);
57
57
  if (!diagnostics)
58
58
  return null;
59
59
  return (0, diagnostics_js_1.enhancedProvideSemanticDiagnostics)(diagnostics, tsxLineCount);
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@astrojs/language-server",
3
- "version": "2.14.0",
3
+ "version": "2.14.2",
4
4
  "author": "withastro",
5
5
  "license": "MIT",
6
6
  "repository": {
@@ -21,22 +21,22 @@
21
21
  },
22
22
  "dependencies": {
23
23
  "@astrojs/compiler": "^2.10.3",
24
- "@astrojs/yaml2ts": "^0.2.0",
24
+ "@astrojs/yaml2ts": "^0.2.1",
25
25
  "@jridgewell/sourcemap-codec": "^1.4.15",
26
- "@volar/kit": "~2.4.0-alpha.15",
27
- "@volar/language-core": "~2.4.0-alpha.15",
28
- "@volar/language-server": "~2.4.0-alpha.15",
29
- "@volar/language-service": "~2.4.0-alpha.15",
30
- "@volar/typescript": "~2.4.0-alpha.15",
26
+ "@volar/kit": "~2.4.0",
27
+ "@volar/language-core": "~2.4.0",
28
+ "@volar/language-server": "~2.4.0",
29
+ "@volar/language-service": "~2.4.0",
30
+ "@volar/typescript": "~2.4.0",
31
31
  "fast-glob": "^3.2.12",
32
32
  "muggle-string": "^0.4.1",
33
- "volar-service-css": "0.0.59",
34
- "volar-service-emmet": "0.0.59",
35
- "volar-service-html": "0.0.59",
36
- "volar-service-prettier": "0.0.59",
37
- "volar-service-typescript": "0.0.59",
38
- "volar-service-typescript-twoslash-queries": "0.0.59",
39
- "volar-service-yaml": "0.0.59",
33
+ "volar-service-css": "0.0.61",
34
+ "volar-service-emmet": "0.0.61",
35
+ "volar-service-html": "0.0.61",
36
+ "volar-service-prettier": "0.0.61",
37
+ "volar-service-typescript": "0.0.61",
38
+ "volar-service-typescript-twoslash-queries": "0.0.61",
39
+ "volar-service-yaml": "0.0.61",
40
40
  "vscode-html-languageservice": "^5.2.0",
41
41
  "vscode-uri": "^3.0.8"
42
42
  },
@@ -46,7 +46,7 @@
46
46
  "@types/chai": "^4.3.5",
47
47
  "@types/mocha": "^10.0.1",
48
48
  "@types/node": "^18.17.8",
49
- "@volar/test-utils": "~2.4.0-alpha.15",
49
+ "@volar/test-utils": "~2.4.0",
50
50
  "astro": "^4.14.0",
51
51
  "chai": "^4.3.7",
52
52
  "mocha": "^10.2.0",