@volar/vscode 2.4.23 → 2.4.24
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/index.d.ts +0 -1
- package/index.js +1 -3
- package/lib/features/autoInsertion.js +3 -2
- package/lib/features/documentDropEdits.js +10 -6
- package/lib/features/fileReferences.js +4 -2
- package/lib/features/tsVersion.js +44 -30
- package/lib/features/tsconfig.js +2 -2
- package/package.json +3 -3
- package/protocol.d.ts +0 -6
- package/protocol.js +1 -9
- package/lib/features/writeVirtualFiles.d.ts +0 -3
package/index.d.ts
CHANGED
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import * as vscode from 'vscode';
|
|
2
2
|
export { activate as activateAutoInsertion } from './lib/features/autoInsertion';
|
|
3
3
|
export { activate as activateDocumentDropEdit } from './lib/features/documentDropEdits';
|
|
4
|
-
export { activate as activateWriteVirtualFiles } from './lib/features/writeVirtualFiles';
|
|
5
4
|
export { activate as activateFindFileReferences } from './lib/features/fileReferences';
|
|
6
5
|
export { activate as activateReloadProjects } from './lib/features/reloadProject';
|
|
7
6
|
export { activate as activateTsConfigStatusItem } from './lib/features/tsconfig';
|
package/index.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.currentLabsVersion = exports.middleware = exports.getTsdk = exports.activateTsVersionStatusItem = exports.activateTsConfigStatusItem = exports.activateReloadProjects = exports.activateFindFileReferences = exports.
|
|
17
|
+
exports.currentLabsVersion = exports.middleware = exports.getTsdk = exports.activateTsVersionStatusItem = exports.activateTsConfigStatusItem = exports.activateReloadProjects = exports.activateFindFileReferences = exports.activateDocumentDropEdit = exports.activateAutoInsertion = void 0;
|
|
18
18
|
exports.parseServerCommand = parseServerCommand;
|
|
19
19
|
exports.createLabsInfo = createLabsInfo;
|
|
20
20
|
const vscode = require("vscode");
|
|
@@ -23,8 +23,6 @@ var autoInsertion_1 = require("./lib/features/autoInsertion");
|
|
|
23
23
|
Object.defineProperty(exports, "activateAutoInsertion", { enumerable: true, get: function () { return autoInsertion_1.activate; } });
|
|
24
24
|
var documentDropEdits_1 = require("./lib/features/documentDropEdits");
|
|
25
25
|
Object.defineProperty(exports, "activateDocumentDropEdit", { enumerable: true, get: function () { return documentDropEdits_1.activate; } });
|
|
26
|
-
var writeVirtualFiles_1 = require("./lib/features/writeVirtualFiles");
|
|
27
|
-
Object.defineProperty(exports, "activateWriteVirtualFiles", { enumerable: true, get: function () { return writeVirtualFiles_1.activate; } });
|
|
28
26
|
var fileReferences_1 = require("./lib/features/fileReferences");
|
|
29
27
|
Object.defineProperty(exports, "activateFindFileReferences", { enumerable: true, get: function () { return fileReferences_1.activate; } });
|
|
30
28
|
var reloadProject_1 = require("./lib/features/reloadProject");
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.activate = activate;
|
|
4
|
-
const protocol_js_1 = require("../../protocol.js");
|
|
5
4
|
const vscode = require("vscode");
|
|
5
|
+
const protocol_js_1 = require("../../protocol.js");
|
|
6
6
|
function activate(selector, client) {
|
|
7
7
|
let isEnabled = false;
|
|
8
8
|
let timeout;
|
|
@@ -25,7 +25,8 @@ function activate(selector, client) {
|
|
|
25
25
|
isEnabled = true;
|
|
26
26
|
}
|
|
27
27
|
function onDidChangeTextDocument({ document, contentChanges, reason }) {
|
|
28
|
-
if (!isEnabled || contentChanges.length === 0 || reason === vscode.TextDocumentChangeReason.Undo
|
|
28
|
+
if (!isEnabled || contentChanges.length === 0 || reason === vscode.TextDocumentChangeReason.Undo
|
|
29
|
+
|| reason === vscode.TextDocumentChangeReason.Redo) {
|
|
29
30
|
return;
|
|
30
31
|
}
|
|
31
32
|
const activeDocument = vscode.window.activeTextEditor?.document;
|
|
@@ -22,15 +22,19 @@ function activate(selector, client) {
|
|
|
22
22
|
return {
|
|
23
23
|
mimeType,
|
|
24
24
|
value: item.value,
|
|
25
|
-
file: file
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
25
|
+
file: file
|
|
26
|
+
? {
|
|
27
|
+
name: file.name,
|
|
28
|
+
uri: file.uri ? client.code2ProtocolConverter.asUri(file.uri) : undefined,
|
|
29
|
+
}
|
|
30
|
+
: undefined,
|
|
29
31
|
};
|
|
30
|
-
})
|
|
32
|
+
}),
|
|
31
33
|
});
|
|
32
34
|
if (result) {
|
|
33
|
-
const edit = new vscode.DocumentDropEdit(result.insertTextFormat === 2 /* InsertTextMode.Snippet */
|
|
35
|
+
const edit = new vscode.DocumentDropEdit(result.insertTextFormat === 2 /* InsertTextMode.Snippet */
|
|
36
|
+
? new vscode.SnippetString(result.insertText)
|
|
37
|
+
: result.insertText);
|
|
34
38
|
if (result.additionalEdit) {
|
|
35
39
|
edit.additionalEdit = await client.protocol2CodeConverter.asWorkspaceEdit(result.additionalEdit);
|
|
36
40
|
}
|
|
@@ -10,7 +10,7 @@ function activate(cmd, client) {
|
|
|
10
10
|
// https://github.com/microsoft/vscode/blob/main/extensions/typescript-language-features/src/languageFeatures/fileReferences.ts
|
|
11
11
|
await vscode.window.withProgress({
|
|
12
12
|
location: vscode.ProgressLocation.Window,
|
|
13
|
-
title: localize('progress.title',
|
|
13
|
+
title: localize('progress.title', 'Finding file references'),
|
|
14
14
|
}, async (_progress) => {
|
|
15
15
|
if (!uri) {
|
|
16
16
|
const editor = vscode.window.activeTextEditor;
|
|
@@ -19,7 +19,9 @@ function activate(cmd, client) {
|
|
|
19
19
|
}
|
|
20
20
|
uri = editor.document.uri;
|
|
21
21
|
}
|
|
22
|
-
const response = await client.sendRequest(protocol_js_1.FindFileReferenceRequest.type, {
|
|
22
|
+
const response = await client.sendRequest(protocol_js_1.FindFileReferenceRequest.type, {
|
|
23
|
+
textDocument: { uri: uri.toString() },
|
|
24
|
+
});
|
|
23
25
|
if (!response) {
|
|
24
26
|
return;
|
|
25
27
|
}
|
|
@@ -37,21 +37,29 @@ function activate(selector, cmd, context, resolveStatusText, onRestart) {
|
|
|
37
37
|
}
|
|
38
38
|
const select = await (0, common_1.quickPick)([
|
|
39
39
|
{
|
|
40
|
-
useVSCodeTsdk: useVSCodeTsdk
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
40
|
+
useVSCodeTsdk: useVSCodeTsdk
|
|
41
|
+
? {
|
|
42
|
+
label: (!tsdk?.isWorkspacePath ? '• ' : '') + "Use VS Code's Version",
|
|
43
|
+
description: vscodeTsdk.version,
|
|
44
|
+
detail: vscodeTsdk.isWeb ? vscodeTsdk.path : undefined,
|
|
45
|
+
}
|
|
46
|
+
: undefined,
|
|
47
|
+
useConfigWorkspaceTsdk: useConfigWorkspaceTsdk
|
|
48
|
+
? {
|
|
49
|
+
label: (tsdk?.isWorkspacePath ? '• ' : '') + 'Use Workspace Version',
|
|
50
|
+
description: await getTsVersion(await resolveWorkspaceTsdk(configTsdkPath) ?? '/')
|
|
51
|
+
?? 'Could not load the TypeScript version at this path',
|
|
52
|
+
detail: configTsdkPath,
|
|
53
|
+
}
|
|
54
|
+
: undefined,
|
|
55
|
+
useDefaultWorkspaceTsdk: useDefaultWorkspaceTsdk
|
|
56
|
+
? {
|
|
57
|
+
label: (tsdk?.isWorkspacePath ? '• ' : '') + 'Use Workspace Version',
|
|
58
|
+
description: await getTsVersion(await resolveWorkspaceTsdk(defaultTsdkPath) ?? '/')
|
|
59
|
+
?? 'Could not load the TypeScript version at this path',
|
|
60
|
+
detail: defaultTsdkPath,
|
|
61
|
+
}
|
|
62
|
+
: undefined,
|
|
55
63
|
},
|
|
56
64
|
]);
|
|
57
65
|
if (select === undefined) {
|
|
@@ -96,11 +104,13 @@ async function getTsdk(context) {
|
|
|
96
104
|
}
|
|
97
105
|
}
|
|
98
106
|
const tsdk = await getVSCodeTsdk();
|
|
99
|
-
return tsdk
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
107
|
+
return tsdk
|
|
108
|
+
? {
|
|
109
|
+
tsdk: tsdk.path,
|
|
110
|
+
version: tsdk.version,
|
|
111
|
+
isWorkspacePath: false,
|
|
112
|
+
}
|
|
113
|
+
: undefined;
|
|
104
114
|
}
|
|
105
115
|
async function resolveWorkspaceTsdk(tsdk) {
|
|
106
116
|
if (path.isAbsolute(tsdk)) {
|
|
@@ -126,20 +136,24 @@ async function getVSCodeTsdk() {
|
|
|
126
136
|
if (nightly) {
|
|
127
137
|
const libPath = path.join(nightly.extensionPath.replace(/\\/g, '/'), 'node_modules/typescript/lib');
|
|
128
138
|
const version = await getTsVersion(libPath);
|
|
129
|
-
return version
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
139
|
+
return version
|
|
140
|
+
? {
|
|
141
|
+
path: libPath,
|
|
142
|
+
version: version,
|
|
143
|
+
isWeb: false,
|
|
144
|
+
}
|
|
145
|
+
: undefined;
|
|
134
146
|
}
|
|
135
147
|
if (vscode.env.appRoot) {
|
|
136
148
|
const libPath = path.join(vscode.env.appRoot.replace(/\\/g, '/'), 'extensions/node_modules/typescript/lib');
|
|
137
149
|
const version = await getTsVersion(libPath);
|
|
138
|
-
return version
|
|
139
|
-
|
|
140
|
-
|
|
141
|
-
|
|
142
|
-
|
|
150
|
+
return version
|
|
151
|
+
? {
|
|
152
|
+
path: libPath,
|
|
153
|
+
version: version,
|
|
154
|
+
isWeb: false,
|
|
155
|
+
}
|
|
156
|
+
: undefined;
|
|
143
157
|
}
|
|
144
158
|
// web
|
|
145
159
|
const version = require('typescript/package.json').version;
|
package/lib/features/tsconfig.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
3
|
exports.activate = activate;
|
|
4
|
+
const path = require("path-browserify");
|
|
4
5
|
const vscode = require("vscode");
|
|
5
6
|
const protocol_js_1 = require("../../protocol.js");
|
|
6
|
-
const path = require("path-browserify");
|
|
7
7
|
function activate(selector, cmd, client) {
|
|
8
8
|
const subscriptions = [];
|
|
9
9
|
const statusBar = vscode.languages.createLanguageStatusItem(cmd, selector);
|
|
@@ -29,7 +29,7 @@ function activate(selector, cmd, client) {
|
|
|
29
29
|
const tsconfig = await client.sendRequest(protocol_js_1.GetMatchTsConfigRequest.type, client.code2ProtocolConverter.asTextDocumentIdentifier(vscode.window.activeTextEditor.document));
|
|
30
30
|
if (tsconfig?.uri) {
|
|
31
31
|
currentTsconfigUri = vscode.Uri.parse(tsconfig.uri);
|
|
32
|
-
statusBar.text = path.relative(
|
|
32
|
+
statusBar.text = path.relative(vscode.workspace.rootPath?.replace(/\\/g, '/') || '/', currentTsconfigUri.fsPath.replace(/\\/g, '/'));
|
|
33
33
|
statusBar.command = {
|
|
34
34
|
title: 'Open config file',
|
|
35
35
|
command: cmd,
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@volar/vscode",
|
|
3
|
-
"version": "2.4.
|
|
3
|
+
"version": "2.4.24",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"files": [
|
|
6
6
|
"**/*.js",
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
"@types/node": "latest",
|
|
21
21
|
"@types/path-browserify": "latest",
|
|
22
22
|
"@types/vscode": "^1.82.0",
|
|
23
|
-
"@volar/language-server": "2.4.
|
|
23
|
+
"@volar/language-server": "2.4.24"
|
|
24
24
|
},
|
|
25
|
-
"gitHead": "
|
|
25
|
+
"gitHead": "a5c7cf5d1afa5c3780a48866d17680c223891e42"
|
|
26
26
|
}
|
package/protocol.d.ts
CHANGED
|
@@ -34,9 +34,6 @@ export declare namespace AutoInsertRequest {
|
|
|
34
34
|
type ErrorType = never;
|
|
35
35
|
const type: protocol.RequestType<ParamsType, ResponseType, never>;
|
|
36
36
|
}
|
|
37
|
-
export declare namespace WriteVirtualFilesNotification {
|
|
38
|
-
const type: protocol.NotificationType<protocol.TextDocumentIdentifier>;
|
|
39
|
-
}
|
|
40
37
|
export declare namespace ReloadProjectNotification {
|
|
41
38
|
const type: protocol.NotificationType<protocol.TextDocumentIdentifier>;
|
|
42
39
|
}
|
|
@@ -130,6 +127,3 @@ export declare namespace GetVirtualCodeRequest {
|
|
|
130
127
|
type ErrorType = never;
|
|
131
128
|
const type: protocol.RequestType<ParamsType, ResponseType, never>;
|
|
132
129
|
}
|
|
133
|
-
export declare namespace LoadedTSFilesMetaRequest {
|
|
134
|
-
const type: protocol.RequestType0<unknown, unknown>;
|
|
135
|
-
}
|
package/protocol.js
CHANGED
|
@@ -14,7 +14,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
|
14
14
|
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
15
15
|
};
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
|
-
exports.
|
|
17
|
+
exports.GetVirtualCodeRequest = exports.GetVirtualFileRequest = exports.GetServicePluginsRequest = exports.UpdateServicePluginStateNotification = exports.UpdateVirtualCodeStateNotification = exports.DocumentDrop_DataTransferItemFileDataRequest = exports.DocumentDrop_DataTransferItemAsStringRequest = exports.DocumentDropRequest = exports.ReloadProjectNotification = exports.AutoInsertRequest = exports.GetMatchTsConfigRequest = exports.FindFileReferenceRequest = void 0;
|
|
18
18
|
const protocol = require("vscode-languageclient");
|
|
19
19
|
__exportStar(require("vscode-languageclient"), exports);
|
|
20
20
|
/**
|
|
@@ -32,10 +32,6 @@ var AutoInsertRequest;
|
|
|
32
32
|
(function (AutoInsertRequest) {
|
|
33
33
|
AutoInsertRequest.type = new protocol.RequestType('volar/client/autoInsert');
|
|
34
34
|
})(AutoInsertRequest || (exports.AutoInsertRequest = AutoInsertRequest = {}));
|
|
35
|
-
var WriteVirtualFilesNotification;
|
|
36
|
-
(function (WriteVirtualFilesNotification) {
|
|
37
|
-
WriteVirtualFilesNotification.type = new protocol.NotificationType('volar/client/writeVirtualFiles');
|
|
38
|
-
})(WriteVirtualFilesNotification || (exports.WriteVirtualFilesNotification = WriteVirtualFilesNotification = {}));
|
|
39
35
|
var ReloadProjectNotification;
|
|
40
36
|
(function (ReloadProjectNotification) {
|
|
41
37
|
ReloadProjectNotification.type = new protocol.NotificationType('volar/client/reloadProject');
|
|
@@ -78,8 +74,4 @@ var GetVirtualCodeRequest;
|
|
|
78
74
|
(function (GetVirtualCodeRequest) {
|
|
79
75
|
GetVirtualCodeRequest.type = new protocol.RequestType('volar/client/virtualFile');
|
|
80
76
|
})(GetVirtualCodeRequest || (exports.GetVirtualCodeRequest = GetVirtualCodeRequest = {}));
|
|
81
|
-
var LoadedTSFilesMetaRequest;
|
|
82
|
-
(function (LoadedTSFilesMetaRequest) {
|
|
83
|
-
LoadedTSFilesMetaRequest.type = new protocol.RequestType0('volar/client/loadedTsFiles');
|
|
84
|
-
})(LoadedTSFilesMetaRequest || (exports.LoadedTSFilesMetaRequest = LoadedTSFilesMetaRequest = {}));
|
|
85
77
|
//# sourceMappingURL=protocol.js.map
|