@volar/monaco 2.2.0-alpha.0 → 2.2.0-alpha.10
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.
- package/lib/editor.js +3 -2
- package/package.json +4 -4
- package/worker.d.ts +10 -6
- package/worker.js +4 -4
package/lib/editor.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { fromPosition,
|
|
1
|
+
import { fromPosition, toMarkerData, toTextEdit } from 'monaco-languageserver-types';
|
|
2
2
|
import { markers } from './markers.js';
|
|
3
3
|
export function activateMarkers(worker, languages, markersOwn, getSyncUris, editor) {
|
|
4
4
|
const disposables = [];
|
|
@@ -131,8 +131,9 @@ export function activateAutoInsertion(worker, languages, getSyncUris, editor) {
|
|
|
131
131
|
lineNumber: lastChange.range.startLineNumber,
|
|
132
132
|
column: lastChange.range.startColumn + lastChange.text.length,
|
|
133
133
|
}), {
|
|
134
|
-
range: fromRange(lastChange.range),
|
|
135
134
|
text: lastChange.text,
|
|
135
|
+
rangeOffset: lastChange.rangeOffset,
|
|
136
|
+
rangeLength: lastChange.rangeLength,
|
|
136
137
|
});
|
|
137
138
|
if (model.getVersionId() !== version) {
|
|
138
139
|
return;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@volar/monaco",
|
|
3
|
-
"version": "2.2.0-alpha.
|
|
3
|
+
"version": "2.2.0-alpha.10",
|
|
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.2.0-alpha.
|
|
17
|
-
"@volar/typescript": "2.2.0-alpha.
|
|
16
|
+
"@volar/language-service": "2.2.0-alpha.10",
|
|
17
|
+
"@volar/typescript": "2.2.0-alpha.10",
|
|
18
18
|
"monaco-languageserver-types": "^0.3.3",
|
|
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": "
|
|
25
|
+
"gitHead": "aedd2230883c457f703be93ed150917a3efde75c"
|
|
26
26
|
}
|
package/worker.d.ts
CHANGED
|
@@ -3,12 +3,13 @@ import type * as monaco from 'monaco-types';
|
|
|
3
3
|
import type * as ts from 'typescript';
|
|
4
4
|
export * from '@volar/language-service';
|
|
5
5
|
export * from './lib/ata.js';
|
|
6
|
-
export declare function createSimpleWorkerService<T = {}>({ env, workerContext, languagePlugins, servicePlugins, extraApis }: {
|
|
6
|
+
export declare function createSimpleWorkerService<T = {}>({ env, workerContext, languagePlugins, servicePlugins, extraApis, getLanguageId, }: {
|
|
7
7
|
env: ServiceEnvironment;
|
|
8
8
|
workerContext: monaco.worker.IWorkerContext<any>;
|
|
9
9
|
languagePlugins?: LanguagePlugin[];
|
|
10
10
|
servicePlugins?: LanguageServicePlugin[];
|
|
11
11
|
extraApis?: T;
|
|
12
|
+
getLanguageId?: (uri: string) => string;
|
|
12
13
|
}): {
|
|
13
14
|
getTriggerCharacters: () => string[];
|
|
14
15
|
getAutoFormatTriggerCharacters: () => string[];
|
|
@@ -51,8 +52,9 @@ export declare function createSimpleWorkerService<T = {}>({ env, workerContext,
|
|
|
51
52
|
findDocumentLinks: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentLink[]>;
|
|
52
53
|
doDocumentLinkResolve: (item: import("@volar/language-service").DocumentLink, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentLink>;
|
|
53
54
|
findWorkspaceSymbols: (query: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceSymbol[]>;
|
|
54
|
-
doAutoInsert: (uri: string,
|
|
55
|
-
|
|
55
|
+
doAutoInsert: (uri: string, selection: import("@volar/language-service").Position, change: {
|
|
56
|
+
rangeOffset: number;
|
|
57
|
+
rangeLength: number;
|
|
56
58
|
text: string;
|
|
57
59
|
}, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<string | import("@volar/language-service").TextEdit | undefined>;
|
|
58
60
|
doDocumentDrop: (uri: string, position: import("@volar/language-service").Position, dataTransfer: Map<string, import("@volar/language-service").DataTransferItem>, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentDropEdit | undefined>;
|
|
@@ -66,7 +68,7 @@ export declare function createSimpleWorkerService<T = {}>({ env, workerContext,
|
|
|
66
68
|
dispose: () => void;
|
|
67
69
|
context: import("@volar/language-service").ServiceContext;
|
|
68
70
|
} & T;
|
|
69
|
-
export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts, compilerOptions, env, workerContext, languagePlugins, servicePlugins, extraApis }: {
|
|
71
|
+
export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts, compilerOptions, env, workerContext, languagePlugins, servicePlugins, extraApis, getLanguageId, }: {
|
|
70
72
|
typescript: typeof import('typescript');
|
|
71
73
|
compilerOptions: ts.CompilerOptions;
|
|
72
74
|
env: ServiceEnvironment;
|
|
@@ -74,6 +76,7 @@ export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts,
|
|
|
74
76
|
languagePlugins?: LanguagePlugin[];
|
|
75
77
|
servicePlugins?: LanguageServicePlugin[];
|
|
76
78
|
extraApis?: T;
|
|
79
|
+
getLanguageId?: (uri: string) => string;
|
|
77
80
|
}): {
|
|
78
81
|
getTriggerCharacters: () => string[];
|
|
79
82
|
getAutoFormatTriggerCharacters: () => string[];
|
|
@@ -116,8 +119,9 @@ export declare function createTypeScriptWorkerService<T = {}>({ typescript: ts,
|
|
|
116
119
|
findDocumentLinks: (uri: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentLink[]>;
|
|
117
120
|
doDocumentLinkResolve: (item: import("@volar/language-service").DocumentLink, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentLink>;
|
|
118
121
|
findWorkspaceSymbols: (query: string, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").WorkspaceSymbol[]>;
|
|
119
|
-
doAutoInsert: (uri: string,
|
|
120
|
-
|
|
122
|
+
doAutoInsert: (uri: string, selection: import("@volar/language-service").Position, change: {
|
|
123
|
+
rangeOffset: number;
|
|
124
|
+
rangeLength: number;
|
|
121
125
|
text: string;
|
|
122
126
|
}, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<string | import("@volar/language-service").TextEdit | undefined>;
|
|
123
127
|
doDocumentDrop: (uri: string, position: import("@volar/language-service").Position, dataTransfer: Map<string, import("@volar/language-service").DataTransferItem>, token?: import("@volar/language-service").CancellationToken | undefined) => Promise<import("@volar/language-service").DocumentDropEdit | undefined>;
|
package/worker.js
CHANGED
|
@@ -2,7 +2,7 @@ import { createLanguageService as _createLanguageService, createLanguage, resolv
|
|
|
2
2
|
import { createTypeScriptLanguage, createSys } from '@volar/typescript';
|
|
3
3
|
export * from '@volar/language-service';
|
|
4
4
|
export * from './lib/ata.js';
|
|
5
|
-
export function createSimpleWorkerService({ env, workerContext, languagePlugins = [], servicePlugins = [], extraApis = {} }) {
|
|
5
|
+
export function createSimpleWorkerService({ env, workerContext, languagePlugins = [], servicePlugins = [], extraApis = {}, getLanguageId = resolveCommonLanguageId, }) {
|
|
6
6
|
const snapshots = new Map();
|
|
7
7
|
const language = createLanguage(languagePlugins, false, uri => {
|
|
8
8
|
const model = workerContext.getMirrorModels().find(model => model.uri.toString() === uri);
|
|
@@ -18,7 +18,7 @@ export function createSimpleWorkerService({ env, workerContext, languagePlugins
|
|
|
18
18
|
getChangeRange: () => undefined,
|
|
19
19
|
};
|
|
20
20
|
snapshots.set(model, [model.version, snapshot]);
|
|
21
|
-
language.scripts.set(uri,
|
|
21
|
+
language.scripts.set(uri, getLanguageId(uri), snapshot);
|
|
22
22
|
}
|
|
23
23
|
else {
|
|
24
24
|
language.scripts.delete(uri);
|
|
@@ -26,7 +26,7 @@ export function createSimpleWorkerService({ env, workerContext, languagePlugins
|
|
|
26
26
|
});
|
|
27
27
|
return createWorkerService(language, servicePlugins, env, extraApis);
|
|
28
28
|
}
|
|
29
|
-
export function createTypeScriptWorkerService({ typescript: ts, compilerOptions, env, workerContext, languagePlugins = [], servicePlugins = [], extraApis = {} }) {
|
|
29
|
+
export function createTypeScriptWorkerService({ typescript: ts, compilerOptions, env, workerContext, languagePlugins = [], servicePlugins = [], extraApis = {}, getLanguageId = resolveCommonLanguageId, }) {
|
|
30
30
|
let projectVersion = 0;
|
|
31
31
|
const modelSnapshot = new WeakMap();
|
|
32
32
|
const modelVersions = new Map();
|
|
@@ -80,7 +80,7 @@ export function createTypeScriptWorkerService({ typescript: ts, compilerOptions,
|
|
|
80
80
|
getCompilationSettings() {
|
|
81
81
|
return compilerOptions;
|
|
82
82
|
},
|
|
83
|
-
getLanguageId: id =>
|
|
83
|
+
getLanguageId: id => getLanguageId(id),
|
|
84
84
|
fileNameToScriptId: env.typescript.fileNameToUri,
|
|
85
85
|
scriptIdToFileName: env.typescript.uriToFileName,
|
|
86
86
|
};
|