@volar/typescript 2.4.0 → 2.4.1
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.
|
@@ -125,12 +125,16 @@ function proxyCreateProgram(ts, original, create) {
|
|
|
125
125
|
if (sourceScript.generated?.languagePlugin.typescript) {
|
|
126
126
|
const { getServiceScript, getExtraServiceScripts } = sourceScript.generated.languagePlugin.typescript;
|
|
127
127
|
const serviceScript = getServiceScript(sourceScript.generated.root);
|
|
128
|
-
if (serviceScript
|
|
129
|
-
let
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
128
|
+
if (serviceScript) {
|
|
129
|
+
let virtualContents;
|
|
130
|
+
if (!serviceScript.preventLeadingOffset) {
|
|
131
|
+
virtualContents = originalSourceFile.text.split('\n').map(line => ' '.repeat(line.length)).join('\n')
|
|
132
|
+
+ serviceScript.code.snapshot.getText(0, serviceScript.code.snapshot.getLength());
|
|
133
|
+
}
|
|
134
|
+
else {
|
|
135
|
+
virtualContents = serviceScript.code.snapshot.getText(0, serviceScript.code.snapshot.getLength());
|
|
136
|
+
}
|
|
137
|
+
const parsedSourceFile = ts.createSourceFile(fileName, virtualContents, languageVersionOrOptions, undefined, serviceScript.scriptKind);
|
|
134
138
|
// @ts-expect-error
|
|
135
139
|
parsedSourceFile.version = originalSourceFile.version;
|
|
136
140
|
parsedSourceFiles.set(originalSourceFile, parsedSourceFile);
|
package/lib/node/transform.js
CHANGED
|
@@ -46,7 +46,7 @@ function transformDiagnostic(language, diagnostic, program, isTsc) {
|
|
|
46
46
|
const [sourceSpanFileName, sourceSpan] = transformTextSpan(undefined, language, serviceScript, {
|
|
47
47
|
start: diagnostic.start,
|
|
48
48
|
length: diagnostic.length
|
|
49
|
-
}, language_core_1.shouldReportDiagnostics) ?? [];
|
|
49
|
+
}, data => (0, language_core_1.shouldReportDiagnostics)(data, String(diagnostic.source), String(diagnostic.code))) ?? [];
|
|
50
50
|
const actualDiagnosticFile = sourceSpanFileName
|
|
51
51
|
? diagnostic.file.fileName === sourceSpanFileName
|
|
52
52
|
? diagnostic.file
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { LanguageServiceEnvironment, Disposable } from '@volar/language-service';
|
|
2
2
|
import type * as ts from 'typescript';
|
|
3
3
|
import { URI } from 'vscode-uri';
|
|
4
|
-
export declare function createSys(sys: ts.System | undefined, env: LanguageServiceEnvironment, getCurrentDirectory: () => string, uriConverter: {
|
|
4
|
+
export declare function createSys(sys: ts.System | undefined, env: Pick<LanguageServiceEnvironment, 'onDidChangeWatchedFiles' | 'fs'>, getCurrentDirectory: () => string, uriConverter: {
|
|
5
5
|
asUri(fileName: string): URI;
|
|
6
6
|
asFileName(uri: URI): string;
|
|
7
7
|
}): ts.System & {
|
|
@@ -63,7 +63,12 @@ function createAsyncLanguageServicePlugin(extensions, getScriptKindForExtraExten
|
|
|
63
63
|
...languagePlugins,
|
|
64
64
|
{ getLanguageId: common_1.resolveFileLanguageId },
|
|
65
65
|
], new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
|
|
66
|
-
|
|
66
|
+
let snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
|
|
67
|
+
if (!snapshot) {
|
|
68
|
+
// trigger projectService.getOrCreateScriptInfoNotOpenedByClient
|
|
69
|
+
info.project.getScriptVersion(fileName);
|
|
70
|
+
snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
|
|
71
|
+
}
|
|
67
72
|
if (snapshot) {
|
|
68
73
|
language.scripts.set(fileName, snapshot);
|
|
69
74
|
}
|
|
@@ -29,7 +29,12 @@ function createLanguageServicePlugin(create) {
|
|
|
29
29
|
...languagePlugins,
|
|
30
30
|
{ getLanguageId: common_1.resolveFileLanguageId },
|
|
31
31
|
], new language_core_1.FileMap(ts.sys.useCaseSensitiveFileNames), fileName => {
|
|
32
|
-
|
|
32
|
+
let snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
|
|
33
|
+
if (!snapshot) {
|
|
34
|
+
// trigger projectService.getOrCreateScriptInfoNotOpenedByClient
|
|
35
|
+
info.project.getScriptVersion(fileName);
|
|
36
|
+
snapshot = info.project.getScriptInfo(fileName)?.getSnapshot();
|
|
37
|
+
}
|
|
33
38
|
if (snapshot) {
|
|
34
39
|
language.scripts.set(fileName, snapshot);
|
|
35
40
|
}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@volar/typescript",
|
|
3
|
-
"version": "2.4.
|
|
3
|
+
"version": "2.4.1",
|
|
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.
|
|
15
|
+
"@volar/language-core": "2.4.1",
|
|
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.
|
|
22
|
+
"@volar/language-service": "2.4.1"
|
|
23
23
|
},
|
|
24
|
-
"gitHead": "
|
|
24
|
+
"gitHead": "b920b6c4a3e4b2d8f46c676ea414e94c437cb5b7"
|
|
25
25
|
}
|