@volar/monaco 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 (2) hide show
  1. package/package.json +4 -4
  2. package/worker.js +5 -6
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@volar/monaco",
3
- "version": "2.0.0-alpha.0",
3
+ "version": "2.0.0-alpha.2",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "files": [
@@ -13,8 +13,8 @@
13
13
  "directory": "packages/monaco"
14
14
  },
15
15
  "dependencies": {
16
- "@volar/language-service": "2.0.0-alpha.0",
17
- "@volar/typescript": "2.0.0-alpha.0",
16
+ "@volar/language-service": "2.0.0-alpha.2",
17
+ "@volar/typescript": "2.0.0-alpha.2",
18
18
  "monaco-languageserver-types": "^0.3.1",
19
19
  "monaco-types": "^0.1.0",
20
20
  "vscode-uri": "^3.0.8"
@@ -22,5 +22,5 @@
22
22
  "devDependencies": {
23
23
  "monaco-editor-core": "latest"
24
24
  },
25
- "gitHead": "6a6be45a3b7983148d90541e7c68ef84c9155a7a"
25
+ "gitHead": "88e80b9f00541ab9478b9c7b7af213813fc8cb20"
26
26
  }
package/worker.js CHANGED
@@ -2,9 +2,10 @@ import { createLanguageService as _createLanguageService, createFileProvider, re
2
2
  import { URI } from 'vscode-uri';
3
3
  import { createLanguage, createSys } from '@volar/typescript';
4
4
  export function createSimpleWorkerService(languages, services, getMirrorModels, extraApis = {}) {
5
- return createWorkerService(services, () => {
5
+ return createWorkerService(services, env => {
6
6
  const snapshots = new Map();
7
- const files = createFileProvider(languages, false, (uri) => {
7
+ const files = createFileProvider(languages, false, fileName => {
8
+ const uri = env.fileNameToUri(fileName);
8
9
  const model = getMirrorModels().find(model => model.uri.toString(true) === uri);
9
10
  if (model) {
10
11
  const cache = snapshots.get(model);
@@ -18,10 +19,10 @@ export function createSimpleWorkerService(languages, services, getMirrorModels,
18
19
  getChangeRange: () => undefined,
19
20
  };
20
21
  snapshots.set(model, [model.version, snapshot]);
21
- files.updateSourceFile(uri, snapshot, resolveCommonLanguageId(uri));
22
+ files.updateSourceFile(fileName, resolveCommonLanguageId(fileName), snapshot);
22
23
  }
23
24
  else {
24
- files.deleteSourceFile(uri);
25
+ files.deleteSourceFile(fileName);
25
26
  }
26
27
  });
27
28
  return { files };
@@ -74,8 +75,6 @@ export function createTypeScriptWorkerService(ts, languages, services, getMirror
74
75
  getCompilationSettings() {
75
76
  return compilerOptions;
76
77
  },
77
- getFileName: env.uriToFileName,
78
- getFileId: env.fileNameToUri,
79
78
  getLanguageId: id => resolveCommonLanguageId(id),
80
79
  };
81
80
  const sys = createSys(ts, env, host.getCurrentDirectory());