@volar/typescript 2.0.0-alpha.0 → 2.0.0-alpha.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/lib/node/decorateLanguageService.js +7 -5
  2. package/lib/node/decorateLanguageServiceHost.js +2 -2
  3. package/lib/protocol/createProject.js +14 -17
  4. package/lib/protocol/getProgram.d.ts +1 -4
  5. package/lib/protocol/getProgram.js +6 -10
  6. package/package.json +4 -4
package/lib/node/decorateLanguageService.js CHANGED
@@ -215,8 +215,10 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
215
215
  for (const [generateEnd, mapping] of map.getGeneratedOffsets(end)) {
216
216
  if ((0, language_core_1.isCodeActionsEnabled)(mapping.data)) {
217
217
  fixes = getCodeFixesAtPosition(fileName, generateStart + (isTsPlugin ? sourceFile.snapshot.getLength() : 0), generateEnd + (isTsPlugin ? sourceFile.snapshot.getLength() : 0), errorCodes, formatOptions, preferences);
218
+ break;
218
219
  }
219
220
  }
221
+ break;
220
222
  }
221
223
  }
222
224
  }
@@ -393,7 +395,6 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
393
395
  .filter(notEmpty);
394
396
  return (0, dedupe_1.dedupeDocumentSpans)(resolved);
395
397
  };
396
- // need client patch
397
398
  languageService.getCompletionsAtPosition = (fileName, position, options, formattingSettings) => {
398
399
  const [virtualFile, sourceFile, map] = getVirtualFileAndMap(fileName);
399
400
  if (virtualFile) {
@@ -406,6 +407,7 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
406
407
  }
407
408
  result.optionalReplacementSpan = transformSpan(fileName, result.optionalReplacementSpan, language_core_1.isCompletionEnabled)?.textSpan;
408
409
  }
410
+ return result;
409
411
  }
410
412
  }
411
413
  }
@@ -552,7 +554,7 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
552
554
  if (source) {
553
555
  return {
554
556
  ...changes,
555
- fileName: source.id,
557
+ fileName: source.fileName,
556
558
  textChanges: changes.textChanges.map(c => {
557
559
  const span = transformSpan(changes.fileName, c.span, filter);
558
560
  if (span) {
@@ -574,7 +576,7 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
574
576
  const [virtualFile, source] = getVirtualFileAndMap(documentSpan.fileName);
575
577
  if (virtualFile) {
576
578
  textSpan = {
577
- fileName: source.id,
579
+ fileName: source.fileName,
578
580
  textSpan: { start: 0, length: 0 },
579
581
  };
580
582
  }
@@ -606,7 +608,7 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
606
608
  for (const sourceEnd of map.getSourceOffsets(textSpan.start + textSpan.length - (isTsPlugin ? sourceFile.snapshot.getLength() : 0))) {
607
609
  if (filter(sourceEnd[1].data)) {
608
610
  return {
609
- fileName: sourceFile.id,
611
+ fileName: sourceFile.fileName,
610
612
  textSpan: {
611
613
  start: sourceStart[0],
612
614
  length: sourceEnd[0] - sourceStart[0],
@@ -629,7 +631,7 @@ function decorateLanguageService(virtualFiles, languageService, isTsPlugin) {
629
631
  const sourceFile = virtualFiles.getSourceFile(fileName);
630
632
  if (sourceFile?.virtualFile) {
631
633
  for (const virtualFile of (0, language_core_1.forEachEmbeddedFile)(sourceFile.virtualFile[0])) {
632
- const ext = virtualFile.id.substring(fileName.length);
634
+ const ext = virtualFile.fileName.substring(fileName.length);
633
635
  if (virtualFile.typescript && (ext === '.d.ts' || ext.match(/^\.(js|ts)x?$/))) {
634
636
  for (const map of virtualFiles.getMaps(virtualFile)) {
635
637
  if (map[1][0] === sourceFile.snapshot) {
package/lib/node/decorateLanguageServiceHost.js CHANGED
@@ -116,12 +116,12 @@ function decorateLanguageServiceHost(virtualFiles, languageServiceHost, ts, exts
116
116
  const snapshot = getScriptSnapshot(fileName);
117
117
  if (snapshot) {
118
118
  extraProjectVersion++;
119
- const sourceFile = virtualFiles.updateSourceFile(fileName, snapshot, (0, language_service_1.resolveCommonLanguageId)(fileName));
119
+ const sourceFile = virtualFiles.updateSourceFile(fileName, (0, language_service_1.resolveCommonLanguageId)(fileName), snapshot);
120
120
  if (sourceFile.virtualFile) {
121
121
  const text = snapshot.getText(0, snapshot.getLength());
122
122
  let patchedText = text.split('\n').map(line => ' '.repeat(line.length)).join('\n');
123
123
  for (const file of (0, language_core_1.forEachEmbeddedFile)(sourceFile.virtualFile[0])) {
124
- const ext = file.id.substring(fileName.length);
124
+ const ext = file.fileName.substring(fileName.length);
125
125
  if (file.typescript && (ext === '.d.ts' || ext.match(/^\.(js|ts)x?$/))) {
126
126
  extension = ext;
127
127
  scriptKind = file.typescript.scriptKind;
package/lib/protocol/createProject.js CHANGED
@@ -8,8 +8,7 @@ const utilities_1 = require("../typescript/utilities");
8
8
  const scriptVersions = new Map();
9
9
  const fsFileSnapshots = new Map();
10
10
  function createLanguage(ts, sys, languages, configFileName, projectHost) {
11
- const files = (0, language_core_1.createFileProvider)(languages, sys.useCaseSensitiveFileNames, (id) => {
12
- const fileName = projectHost.getFileName(id);
11
+ const files = (0, language_core_1.createFileProvider)(languages, sys.useCaseSensitiveFileNames, fileName => {
13
12
  // opened files
14
13
  let snapshot = projectHost.getScriptSnapshot(fileName);
15
14
  if (!snapshot) {
@@ -29,10 +28,10 @@ function createLanguage(ts, sys, languages, configFileName, projectHost) {
29
28
  snapshot = fsFileSnapshots.get(fileName)?.[1];
30
29
  }
31
30
  if (snapshot) {
32
- files.updateSourceFile(id, snapshot, projectHost.getLanguageId(id));
31
+ files.updateSourceFile(fileName, projectHost.getLanguageId(fileName), snapshot);
33
32
  }
34
33
  else {
35
- files.deleteSourceFile(id);
34
+ files.deleteSourceFile(fileName);
36
35
  }
37
36
  });
38
37
  let languageServiceHost = createLanguageServiceHost();
@@ -153,9 +152,9 @@ function createLanguage(ts, sys, languages, configFileName, projectHost) {
153
152
  };
154
153
  }, sys?.realpath ? (path => sys.realpath(path)) : (path => path));
155
154
  matches = matches.map(match => {
156
- const [_, source] = files.getVirtualFile(projectHost.getFileId(match));
155
+ const [_, source] = files.getVirtualFile(match);
157
156
  if (source) {
158
- return projectHost.getFileName(source.id);
157
+ return source.fileName;
159
158
  }
160
159
  return match;
161
160
  });
@@ -174,11 +173,11 @@ function createLanguage(ts, sys, languages, configFileName, projectHost) {
174
173
  },
175
174
  getScriptKind(fileName) {
176
175
  syncSourceFile(fileName);
177
- const virtualFile = files.getVirtualFile(projectHost.getFileId(fileName))[0];
176
+ const virtualFile = files.getVirtualFile(fileName)[0];
178
177
  if (virtualFile?.typescript) {
179
178
  return virtualFile.typescript.scriptKind;
180
179
  }
181
- const sourceFile = files.getSourceFile(projectHost.getFileId(fileName));
180
+ const sourceFile = files.getSourceFile(fileName);
182
181
  if (sourceFile?.virtualFile) {
183
182
  return ts.ScriptKind.Deferred;
184
183
  }
@@ -209,7 +208,7 @@ function createLanguage(ts, sys, languages, configFileName, projectHost) {
209
208
  for (const language of languages) {
210
209
  const sourceFileName = language.typescript?.resolveSourceFileName(tsFileName);
211
210
  if (sourceFileName) {
212
- files.getSourceFile(projectHost.getFileId(sourceFileName)); // trigger sync
211
+ files.getSourceFile(sourceFileName); // trigger sync
213
212
  }
214
213
  }
215
214
  }
@@ -223,13 +222,12 @@ function createLanguage(ts, sys, languages, configFileName, projectHost) {
223
222
  const newOtherVirtualFileSnapshots = new Set();
224
223
  const tsFileNamesSet = new Set();
225
224
  for (const fileName of projectHost.getScriptFileNames()) {
226
- const uri = projectHost.getFileId(fileName);
227
- const sourceFile = files.getSourceFile(uri);
225
+ const sourceFile = files.getSourceFile(fileName);
228
226
  if (sourceFile?.virtualFile) {
229
227
  for (const file of (0, language_core_2.forEachEmbeddedFile)(sourceFile.virtualFile[0])) {
230
228
  if (file.typescript) {
231
229
  newTsVirtualFileSnapshots.add(file.snapshot);
232
- tsFileNamesSet.add(projectHost.getFileName(file.id)); // virtual .ts
230
+ tsFileNamesSet.add(file.fileName); // virtual .ts
233
231
  }
234
232
  else {
235
233
  newOtherVirtualFileSnapshots.add(file.snapshot);
@@ -256,12 +254,11 @@ function createLanguage(ts, sys, languages, configFileName, projectHost) {
256
254
  }
257
255
  function getScriptSnapshot(fileName) {
258
256
  syncSourceFile(fileName);
259
- const uri = projectHost.getFileId(fileName);
260
- const virtualFile = files.getVirtualFile(uri)[0];
257
+ const virtualFile = files.getVirtualFile(fileName)[0];
261
258
  if (virtualFile) {
262
259
  return virtualFile.snapshot;
263
260
  }
264
- const sourceFile = files.getSourceFile(uri);
261
+ const sourceFile = files.getSourceFile(fileName);
265
262
  if (sourceFile && !sourceFile.virtualFile) {
266
263
  return sourceFile.snapshot;
267
264
  }
@@ -272,7 +269,7 @@ function createLanguage(ts, sys, languages, configFileName, projectHost) {
272
269
  scriptVersions.set(fileName, { lastVersion: 0, map: new WeakMap() });
273
270
  }
274
271
  const version = scriptVersions.get(fileName);
275
- const virtualFile = files.getVirtualFile(projectHost.getFileId(fileName))[0];
272
+ const virtualFile = files.getVirtualFile(fileName)[0];
276
273
  if (virtualFile) {
277
274
  if (!version.map.has(virtualFile.snapshot)) {
278
275
  version.map.set(virtualFile.snapshot, version.lastVersion++);
@@ -281,7 +278,7 @@ function createLanguage(ts, sys, languages, configFileName, projectHost) {
281
278
  }
282
279
  const isOpenedFile = !!projectHost.getScriptSnapshot(fileName);
283
280
  if (isOpenedFile) {
284
- const sourceFile = files.getSourceFile(projectHost.getFileId(fileName));
281
+ const sourceFile = files.getSourceFile(fileName);
285
282
  if (sourceFile && !sourceFile.virtualFile) {
286
283
  if (!version.map.has(sourceFile.snapshot)) {
287
284
  version.map.set(sourceFile.snapshot, version.lastVersion++);
package/lib/protocol/getProgram.d.ts CHANGED
@@ -1,6 +1,3 @@
1
1
  import { type FileProvider } from '@volar/language-core';
2
2
  import type * as ts from 'typescript/lib/tsserverlibrary';
3
- export declare function getProgram(ts: typeof import('typescript/lib/tsserverlibrary'), files: FileProvider, { getFileId, getFileName }: {
4
- getFileId(fileName: string): string;
5
- getFileName(id: string): string;
6
- }, ls: ts.LanguageService, sys: ts.System): ts.Program;
3
+ export declare function getProgram(ts: typeof import('typescript/lib/tsserverlibrary'), files: FileProvider, ls: ts.LanguageService, sys: ts.System): ts.Program;
package/lib/protocol/getProgram.js CHANGED
@@ -2,7 +2,7 @@
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getProgram = void 0;
4
4
  const language_core_1 = require("@volar/language-core");
5
- function getProgram(ts, files, { getFileId, getFileName }, ls, sys) {
5
+ function getProgram(ts, files, ls, sys) {
6
6
  const proxy = {
7
7
  getRootFileNames,
8
8
  emit,
@@ -50,8 +50,7 @@ function getProgram(ts, files, { getFileId, getFileName }, ls, sys) {
50
50
  }
51
51
  function getSourceFileDiagnosticsWorker(sourceFile, cancellationToken, api) {
52
52
  if (sourceFile) {
53
- const uri = getFileId(sourceFile.fileName);
54
- const [virtualFile, source] = files.getVirtualFile(uri);
53
+ const [virtualFile, source] = files.getVirtualFile(sourceFile.fileName);
55
54
  if (virtualFile && source) {
56
55
  if (!virtualFile.mappings.some(mapping => (0, language_core_1.isDiagnosticsEnabled)(mapping.data)))
57
56
  return [];
@@ -79,11 +78,9 @@ function getProgram(ts, files, { getFileId, getFileName }, ls, sys) {
79
78
  if (diagnostic.file !== undefined
80
79
  && diagnostic.start !== undefined
81
80
  && diagnostic.length !== undefined) {
82
- const uri = getFileId(diagnostic.file.fileName);
83
- const [virtualFile, source] = files.getVirtualFile(uri);
81
+ const [virtualFile, source] = files.getVirtualFile(diagnostic.file.fileName);
84
82
  if (virtualFile && source) {
85
- const sourceFileName = getFileName(source.id);
86
- if (sys.fileExists?.(sourceFileName) === false)
83
+ if (sys.fileExists?.(source.fileName) === false)
87
84
  continue;
88
85
  for (const [_, [sourceSnapshot, map]] of files.getMaps(virtualFile)) {
89
86
  if (sourceSnapshot !== source.snapshot)
@@ -94,7 +91,7 @@ function getProgram(ts, files, { getFileId, getFileName }, ls, sys) {
94
91
  for (const end of map.getSourceOffsets(diagnostic.start + diagnostic.length)) {
95
92
  if (!(0, language_core_1.shouldReportDiagnostics)(end[1].data))
96
93
  continue;
97
- onMapping(diagnostic, sourceFileName, start[0], end[0], source.snapshot.getText(0, source.snapshot.getLength()));
94
+ onMapping(diagnostic, source.fileName, start[0], end[0], source.snapshot.getText(0, source.snapshot.getLength()));
98
95
  break;
99
96
  }
100
97
  break;
@@ -118,8 +115,7 @@ function getProgram(ts, files, { getFileId, getFileName }, ls, sys) {
118
115
  : undefined;
119
116
  if (!file) {
120
117
  if (docText === undefined) {
121
- const uri = getFileId(fileName);
122
- const snapshot = files.getSourceFile(uri)?.snapshot;
118
+ const snapshot = files.getSourceFile(fileName)?.snapshot;
123
119
  if (snapshot) {
124
120
  docText = snapshot.getText(0, snapshot.getLength());
125
121
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@volar/typescript",
3
- "version": "2.0.0-alpha.0",
3
+ "version": "2.0.0-alpha.2",
4
4
  "license": "MIT",
5
5
  "files": [
6
6
  "**/*.js",
@@ -12,12 +12,12 @@
12
12
  "directory": "packages/typescript"
13
13
  },
14
14
  "dependencies": {
15
- "@volar/language-core": "2.0.0-alpha.0",
15
+ "@volar/language-core": "2.0.0-alpha.2",
16
16
  "path-browserify": "^1.0.1"
17
17
  },
18
18
  "devDependencies": {
19
19
  "@types/path-browserify": "latest",
20
- "@volar/language-service": "2.0.0-alpha.0"
20
+ "@volar/language-service": "2.0.0-alpha.2"
21
21
  },
22
- "gitHead": "6a6be45a3b7983148d90541e7c68ef84c9155a7a"
22
+ "gitHead": "88e80b9f00541ab9478b9c7b7af213813fc8cb20"
23
23
  }