@volar/typescript 2.4.0-alpha.15 → 2.4.0-alpha.17

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 (4) hide show
  1. package/lib/quickstart/createAsyncLanguageServicePlugin.d.ts +1 -1
  2. package/lib/quickstart/createAsyncLanguageServicePlugin.js +10 -9
  3. package/lib/quickstart/createLanguageServicePlugin.js +1 -9
  4. package/package.json +4 -4
package/lib/quickstart/createAsyncLanguageServicePlugin.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { Language, LanguagePlugin } from '@volar/language-core';
2
2
  import type * as ts from 'typescript';
3
- export declare function createAsyncLanguageServicePlugin(extensions: string[], scriptKind: ts.ScriptKind, create: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => Promise<{
3
+ export declare function createAsyncLanguageServicePlugin(extensions: string[], getScriptKindForExtraExtensions: ts.ScriptKind | ((fileName: string) => ts.ScriptKind), create: (ts: typeof import('typescript'), info: ts.server.PluginCreateInfo) => Promise<{
4
4
  languagePlugins: LanguagePlugin<string>[];
5
5
  setup?: (language: Language<string>) => void;
6
6
  }>): ts.server.PluginModuleFactory;
package/lib/quickstart/createAsyncLanguageServicePlugin.js CHANGED
@@ -6,7 +6,7 @@ const common_1 = require("../common");
6
6
  const proxyLanguageService_1 = require("../node/proxyLanguageService");
7
7
  const decorateLanguageServiceHost_1 = require("../node/decorateLanguageServiceHost");
8
8
  const createLanguageServicePlugin_1 = require("./createLanguageServicePlugin");
9
- function createAsyncLanguageServicePlugin(extensions, scriptKind, create) {
9
+ function createAsyncLanguageServicePlugin(extensions, getScriptKindForExtraExtensions, create) {
10
10
  return modules => {
11
11
  const { typescript: ts } = modules;
12
12
  const pluginModule = {
@@ -36,7 +36,14 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, create) {
36
36
  if (getScriptKind) {
37
37
  info.languageServiceHost.getScriptKind = fileName => {
38
38
  if (!initialized && extensions.some(ext => fileName.endsWith(ext))) {
39
- return scriptKind; // TODO: bypass upstream bug
39
+ // bypass upstream bug https://github.com/microsoft/TypeScript/issues/57631
40
+ // TODO: check if the bug is fixed in 5.5
41
+ if (typeof getScriptKindForExtraExtensions === 'function') {
42
+ return getScriptKindForExtraExtensions(fileName);
43
+ }
44
+ else {
45
+ return getScriptKindForExtraExtensions;
46
+ }
40
47
  }
41
48
  return getScriptKind(fileName);
42
49
  };
@@ -52,17 +59,11 @@ function createAsyncLanguageServicePlugin(extensions, scriptKind, create) {
52
59
  const { proxy, initialize } = (0, proxyLanguageService_1.createProxyLanguageService)(info.languageService);
53
60
  info.languageService = proxy;
54
61
  create(ts, info).then(({ languagePlugins, setup }) => {
55
- const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
56
62
  const language = (0, language_core_1.createLanguage)([
57
63
  ...languagePlugins,
58
64
  { getLanguageId: common_1.resolveFileLanguageId },
59
65
  ], new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
60
- const version = getScriptVersion(fileName);
61
- if (syncedScriptVersions.get(fileName) === version) {
62
- return;
63
- }
64
- syncedScriptVersions.set(fileName, version);
65
- const snapshot = getScriptSnapshot(fileName);
66
+ const snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
66
67
  if (snapshot) {
67
68
  language.scripts.set(fileName, snapshot);
68
69
  }
package/lib/quickstart/createLanguageServicePlugin.js CHANGED
@@ -25,19 +25,11 @@ function createLanguageServicePlugin(create) {
25
25
  .map(plugin => plugin.typescript?.extraFileExtensions.map(ext => '.' + ext.extension) ?? [])
26
26
  .flat();
27
27
  exports.projectExternalFileExtensions.set(info.project, extensions);
28
- const getScriptSnapshot = info.languageServiceHost.getScriptSnapshot.bind(info.languageServiceHost);
29
- const getScriptVersion = info.languageServiceHost.getScriptVersion.bind(info.languageServiceHost);
30
- const syncedScriptVersions = new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames);
31
28
  const language = (0, language_core_1.createLanguage)([
32
29
  ...languagePlugins,
33
30
  { getLanguageId: common_1.resolveFileLanguageId },
34
31
  ], new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
35
- const version = getScriptVersion(fileName);
36
- if (syncedScriptVersions.get(fileName) === version) {
37
- return;
38
- }
39
- syncedScriptVersions.set(fileName, version);
40
- const snapshot = getScriptSnapshot(fileName);
32
+ const snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
41
33
  if (snapshot) {
42
34
  language.scripts.set(fileName, snapshot);
43
35
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@volar/typescript",
3
- "version": "2.4.0-alpha.15",
3
+ "version": "2.4.0-alpha.17",
4
4
  "license": "MIT",
5
5
  "files": [
6
6
  "**/*.js",
@@ -12,14 +12,14 @@
12
12
  "directory": "packages/typescript"
13
13
  },
14
14
  "dependencies": {
15
- "@volar/language-core": "2.4.0-alpha.15",
15
+ "@volar/language-core": "2.4.0-alpha.17",
16
16
  "path-browserify": "^1.0.1",
17
17
  "vscode-uri": "^3.0.8"
18
18
  },
19
19
  "devDependencies": {
20
20
  "@types/node": "latest",
21
21
  "@types/path-browserify": "latest",
22
- "@volar/language-service": "2.4.0-alpha.15"
22
+ "@volar/language-service": "2.4.0-alpha.17"
23
23
  },
24
- "gitHead": "01867e962d6147c93ed4386d2a5c66bd08d2ef53"
24
+ "gitHead": "d0c3954d27f67f9867ea1e7c89bbf7f8365cab7a"
25
25
  }