@volar/monaco 2.0.0-alpha.2 → 2.0.0-alpha.4

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/editor.js +1 -1
  2. package/lib/provider.js +5 -16
  3. package/package.json +5 -5
  4. package/worker.d.ts +4 -4
package/lib/editor.js CHANGED
@@ -60,7 +60,7 @@ export function activateMarkers(worker, languages, markersOwn, getSyncUris, edit
60
60
  }
61
61
  const version = model.getVersionId();
62
62
  const languageService = await worker.withSyncedResources(getSyncUris());
63
- const diagnostics = await languageService.doValidation(model.uri.toString(), 'all');
63
+ const diagnostics = await languageService.doValidation(model.uri.toString());
64
64
  if (model.getVersionId() !== version) {
65
65
  return;
66
66
  }
package/lib/provider.js CHANGED
@@ -1,5 +1,5 @@
1
1
  import { standardSemanticTokensLegend, } from '@volar/language-service';
2
- import { fromCompletionContext, fromFormattingOptions, fromPosition, fromRange, fromSignatureHelpContext, toCodeAction, toCodeLens, toColorInformation, toColorPresentation, toCompletionItem, toCompletionList, toDocumentHighlight, toDocumentSymbol, toFoldingRange, toHover, toInlayHint, toLink, toLocation, toLocationLink, toRange, toSelectionRange, toSignatureHelp, toTextEdit, toWorkspaceEdit, } from 'monaco-languageserver-types';
2
+ import { fromCompletionContext, fromFormattingOptions, fromPosition, fromRange, fromSignatureHelpContext, toCodeAction, toCodeLens, toColorInformation, toColorPresentation, toCompletionItem, toCompletionList, toDocumentHighlight, toDocumentSymbol, toFoldingRange, toHover, toInlayHint, toLink, toLinkedEditingRanges, toLocation, toLocationLink, toSelectionRange, toSemanticTokens, toSignatureHelp, toTextEdit, toWorkspaceEdit, } from 'monaco-languageserver-types';
3
3
  import { markers } from './markers.js';
4
4
  export async function createLanguageFeaturesProvider(worker, getSyncUris) {
5
5
  const completionItems = new WeakMap();
@@ -21,20 +21,14 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
21
21
  const languageService = await worker.withSyncedResources(getSyncUris());
22
22
  const codeResult = await languageService.getSemanticTokens(model.uri.toString(), undefined, standardSemanticTokensLegend);
23
23
  if (codeResult) {
24
- return {
25
- resultId: codeResult.resultId,
26
- data: Uint32Array.from(codeResult.data),
27
- };
24
+ return toSemanticTokens(codeResult);
28
25
  }
29
26
  },
30
27
  async provideDocumentRangeSemanticTokens(model, range) {
31
28
  const languageService = await worker.withSyncedResources(getSyncUris());
32
29
  const codeResult = await languageService.getSemanticTokens(model.uri.toString(), fromRange(range), standardSemanticTokensLegend);
33
30
  if (codeResult) {
34
- return {
35
- resultId: codeResult.resultId,
36
- data: Uint32Array.from(codeResult.data),
37
- };
31
+ return toSemanticTokens(codeResult);
38
32
  }
39
33
  },
40
34
  releaseDocumentSemanticTokens() { },
@@ -56,12 +50,7 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
56
50
  const languageService = await worker.withSyncedResources(getSyncUris());
57
51
  const codeResult = await languageService.findLinkedEditingRanges(model.uri.toString(), fromPosition(position));
58
52
  if (codeResult) {
59
- return {
60
- ranges: codeResult.ranges.map(toRange),
61
- wordPattern: codeResult.wordPattern
62
- ? new RegExp(codeResult.wordPattern)
63
- : undefined,
64
- };
53
+ return toLinkedEditingRanges(codeResult);
65
54
  }
66
55
  },
67
56
  async provideDefinition(model, position) {
@@ -278,7 +267,7 @@ export async function createLanguageFeaturesProvider(worker, getSyncUris) {
278
267
  },
279
268
  async provideReferences(model, position, _context) {
280
269
  const languageService = await worker.withSyncedResources(getSyncUris());
281
- const codeResult = await languageService.findReferences(model.uri.toString(), fromPosition(position));
270
+ const codeResult = await languageService.findReferences(model.uri.toString(), fromPosition(position), { includeDeclaration: true });
282
271
  if (codeResult) {
283
272
  return codeResult.map(toLocation);
284
273
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@volar/monaco",
3
- "version": "2.0.0-alpha.2",
3
+ "version": "2.0.0-alpha.4",
4
4
  "license": "MIT",
5
5
  "type": "module",
6
6
  "files": [
@@ -13,14 +13,14 @@
13
13
  "directory": "packages/monaco"
14
14
  },
15
15
  "dependencies": {
16
- "@volar/language-service": "2.0.0-alpha.2",
17
- "@volar/typescript": "2.0.0-alpha.2",
18
- "monaco-languageserver-types": "^0.3.1",
16
+ "@volar/language-service": "2.0.0-alpha.4",
17
+ "@volar/typescript": "2.0.0-alpha.4",
18
+ "monaco-languageserver-types": "^0.3.2",
19
19
  "monaco-types": "^0.1.0",
20
20
  "vscode-uri": "^3.0.8"
21
21
  },
22
22
  "devDependencies": {
23
23
  "monaco-editor-core": "latest"
24
24
  },
25
- "gitHead": "88e80b9f00541ab9478b9c7b7af213813fc8cb20"
25
+ "gitHead": "4d07249613d0cc5de4197e90c741a64adf92b84b"
26
26
  }
package/worker.d.ts CHANGED
@@ -16,8 +16,8 @@ export declare function createSimpleWorkerService<T = {}>(languages: LanguagePlu
16
16
  findDocumentSymbols: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentSymbol[] | undefined>;
17
17
  findDocumentColors: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").ColorInformation[] | undefined>;
18
18
  getColorPresentations: (uri: string, color: import("@volar/language-service").Color, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").ColorPresentation[] | undefined>;
19
- doValidation: (uri: string, mode: "all" | "semantic" | "syntactic", token?: import("@volar/language-service").CancellationToken | undefined, response?: ((result: import("@volar/language-service").Diagnostic[]) => void) | undefined) => Promise<import("@volar/language-service").Diagnostic[]>;
20
- findReferences: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Location[] | undefined>;
19
+ doValidation: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined, response?: ((result: import("@volar/language-service").Diagnostic[]) => void) | undefined) => Promise<import("@volar/language-service").Diagnostic[]>;
20
+ findReferences: (uri: string, position: import("@volar/language-service").Position, referenceContext: import("@volar/language-service").ReferenceContext, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Location[] | undefined>;
21
21
  findFileReferences: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => import("@volar/language-service").NullableResult<import("@volar/language-service").Location[]>;
22
22
  findDefinition: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
23
23
  findTypeDefinition: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
@@ -73,8 +73,8 @@ export declare function createTypeScriptWorkerService<T = {}>(ts: typeof import(
73
73
  findDocumentSymbols: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentSymbol[] | undefined>;
74
74
  findDocumentColors: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").ColorInformation[] | undefined>;
75
75
  getColorPresentations: (uri: string, color: import("@volar/language-service").Color, range: import("@volar/language-service").Range, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").ColorPresentation[] | undefined>;
76
- doValidation: (uri: string, mode: "all" | "semantic" | "syntactic", token?: import("@volar/language-service").CancellationToken | undefined, response?: ((result: import("@volar/language-service").Diagnostic[]) => void) | undefined) => Promise<import("@volar/language-service").Diagnostic[]>;
77
- findReferences: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Location[] | undefined>;
76
+ doValidation: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined, response?: ((result: import("@volar/language-service").Diagnostic[]) => void) | undefined) => Promise<import("@volar/language-service").Diagnostic[]>;
77
+ findReferences: (uri: string, position: import("@volar/language-service").Position, referenceContext: import("@volar/language-service").ReferenceContext, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").Location[] | undefined>;
78
78
  findFileReferences: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => import("@volar/language-service").NullableResult<import("@volar/language-service").Location[]>;
79
79
  findDefinition: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;
80
80
  findTypeDefinition: (uri: string, position: import("@volar/language-service").Position, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").LocationLink[] | undefined>;