Skip to content

Commit a70ad6b

Browse files
committed
update client
1 parent c674702 commit a70ad6b

File tree

5 files changed

+38
-42
lines changed

5 files changed

+38
-42
lines changed

client/out/extension.js

Lines changed: 14 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
"url": "https://github.com/Microsoft/vscode-extension-samples"
1111
},
1212
"engines": {
13-
"vscode": "^1.43.0"
13+
"vscode": "^1.52.0"
1414
},
1515
"dependencies": {
1616
"@types/node": "^13.13.15",
17-
"@types/vscode": "^1.48.0",
17+
"@types/vscode": "^1.52.0",
1818
"vscode-languageclient": "^7.0.0"
1919
}
2020
}

client/src/extension.ts

Lines changed: 18 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3,30 +3,27 @@ import * as languageserver from './languageserver';
33

44
let luadoc = require('../3rd/vscode-lua-doc/extension.js')
55

6-
interface LuaDocExtensionContext extends vscode.ExtensionContext {
7-
readonly ViewType: string;
8-
readonly OpenCommand: string;
9-
}
10-
116
export function activate(context: vscode.ExtensionContext) {
7+
128
languageserver.activate(context);
139

14-
let luadocContext: LuaDocExtensionContext = {
15-
subscriptions: context.subscriptions,
16-
workspaceState: context.workspaceState,
17-
globalState: context.globalState,
18-
extensionPath: context.extensionPath + '/client/3rd/vscode-lua-doc',
19-
asAbsolutePath: context.asAbsolutePath,
20-
storagePath: context.storagePath,
21-
globalStoragePath: context.globalStoragePath,
22-
logPath: context.logPath,
23-
extensionUri: context.extensionUri,
24-
environmentVariableCollection: context.environmentVariableCollection,
25-
extensionMode: context.extensionMode,
26-
ViewType: 'lua-doc',
27-
OpenCommand: 'extension.lua.doc',
28-
};
29-
luadoc.activate(luadocContext);
10+
let luaDocContext = {
11+
ViewType: undefined,
12+
OpenCommand: undefined,
13+
extensionPath: undefined,
14+
}
15+
16+
for (const k in context) {
17+
if (k != 'extensionPath'
18+
&& k != 'extensionRuntime') {
19+
luaDocContext[k] = context[k];
20+
}
21+
}
22+
luaDocContext.ViewType = 'lua-doc';
23+
luaDocContext.OpenCommand = 'extension.lua.doc';
24+
luaDocContext.extensionPath = context.extensionPath + '/client/3rd/vscode-lua-doc'
25+
26+
luadoc.activate(luaDocContext);
3027
}
3128

3229
export function deactivate() {

package-lock.json

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)