@vue/language-server 3.0.0-beta.4 → 3.0.0-beta.5

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/index.js +33 -33
  2. package/package.json +5 -5
package/index.js CHANGED
@@ -11,7 +11,13 @@ const reactionsAnalyze_1 = require("./lib/reactionsAnalyze");
11
11
  const reactionsAnalyzeLS_1 = require("./lib/reactionsAnalyzeLS");
12
12
  const connection = (0, node_1.createConnection)();
13
13
  const server = (0, node_1.createServer)(connection);
14
+ const tsserverRequestHandlers = new Map();
15
+ let tsserverRequestId = 0;
14
16
  connection.listen();
17
+ connection.onNotification('tsserver/response', ([id, res]) => {
18
+ tsserverRequestHandlers.get(id)?.(res);
19
+ tsserverRequestHandlers.delete(id);
20
+ });
15
21
  connection.onInitialize(params => {
16
22
  const tsconfigProjects = (0, language_service_1.createUriMap)();
17
23
  const file2ProjectInfo = new Map();
@@ -25,13 +31,7 @@ connection.onInitialize(params => {
25
31
  }
26
32
  }
27
33
  });
28
- let simpleLs;
29
- let tsserverRequestId = 0;
30
- const tsserverRequestHandlers = new Map();
31
- connection.onNotification('tsserver/response', ([id, res]) => {
32
- tsserverRequestHandlers.get(id)?.(res);
33
- tsserverRequestHandlers.delete(id);
34
- });
34
+ let simpleLanguageService;
35
35
  return server.initialize(params, {
36
36
  setup() { },
37
37
  async getLanguageService(uri) {
@@ -39,7 +39,7 @@ connection.onInitialize(params => {
39
39
  const fileName = uri.fsPath.replace(/\\/g, '/');
40
40
  let projectInfoPromise = file2ProjectInfo.get(fileName);
41
41
  if (!projectInfoPromise) {
42
- projectInfoPromise = sendTsRequest('_vue:' + ts.server.protocol.CommandTypes.ProjectInfo, {
42
+ projectInfoPromise = sendTsServerRequest('_vue:' + ts.server.protocol.CommandTypes.ProjectInfo, {
43
43
  file: fileName,
44
44
  needFileNameList: false,
45
45
  });
@@ -48,69 +48,69 @@ connection.onInitialize(params => {
48
48
  const projectInfo = await projectInfoPromise;
49
49
  if (projectInfo) {
50
50
  const { configFileName } = projectInfo;
51
- let ls = tsconfigProjects.get(vscode_uri_1.URI.file(configFileName));
52
- if (!ls) {
53
- ls = createLs(server, configFileName);
54
- tsconfigProjects.set(vscode_uri_1.URI.file(configFileName), ls);
51
+ let languageService = tsconfigProjects.get(vscode_uri_1.URI.file(configFileName));
52
+ if (!languageService) {
53
+ languageService = createProjectLanguageService(server, configFileName);
54
+ tsconfigProjects.set(vscode_uri_1.URI.file(configFileName), languageService);
55
55
  }
56
- return ls;
56
+ return languageService;
57
57
  }
58
58
  }
59
- return simpleLs ??= createLs(server, undefined);
59
+ return simpleLanguageService ??= createProjectLanguageService(server, undefined);
60
60
  },
61
61
  getExistingLanguageServices() {
62
62
  return Promise.all([
63
63
  ...tsconfigProjects.values(),
64
- simpleLs,
64
+ simpleLanguageService,
65
65
  ].filter(promise => !!promise));
66
66
  },
67
67
  reload() {
68
- for (const ls of tsconfigProjects.values()) {
69
- ls.dispose();
68
+ for (const languageService of tsconfigProjects.values()) {
69
+ languageService.dispose();
70
70
  }
71
71
  tsconfigProjects.clear();
72
- if (simpleLs) {
73
- simpleLs.dispose();
74
- simpleLs = undefined;
72
+ if (simpleLanguageService) {
73
+ simpleLanguageService.dispose();
74
+ simpleLanguageService = undefined;
75
75
  }
76
76
  },
77
77
  }, (0, language_service_1.createVueLanguageServicePlugins)(ts, {
78
78
  collectExtractProps(...args) {
79
- return sendTsRequest('_vue:collectExtractProps', args);
79
+ return sendTsServerRequest('_vue:collectExtractProps', args);
80
80
  },
81
81
  getComponentDirectives(...args) {
82
- return sendTsRequest('_vue:getComponentDirectives', args);
82
+ return sendTsServerRequest('_vue:getComponentDirectives', args);
83
83
  },
84
84
  getComponentEvents(...args) {
85
- return sendTsRequest('_vue:getComponentEvents', args);
85
+ return sendTsServerRequest('_vue:getComponentEvents', args);
86
86
  },
87
87
  getComponentNames(...args) {
88
- return sendTsRequest('_vue:getComponentNames', args);
88
+ return sendTsServerRequest('_vue:getComponentNames', args);
89
89
  },
90
90
  getComponentProps(...args) {
91
- return sendTsRequest('_vue:getComponentProps', args);
91
+ return sendTsServerRequest('_vue:getComponentProps', args);
92
92
  },
93
93
  getElementAttrs(...args) {
94
- return sendTsRequest('_vue:getElementAttrs', args);
94
+ return sendTsServerRequest('_vue:getElementAttrs', args);
95
95
  },
96
96
  getElementNames(...args) {
97
- return sendTsRequest('_vue:getElementNames', args);
97
+ return sendTsServerRequest('_vue:getElementNames', args);
98
98
  },
99
99
  getImportPathForFile(...args) {
100
- return sendTsRequest('_vue:getImportPathForFile', args);
100
+ return sendTsServerRequest('_vue:getImportPathForFile', args);
101
101
  },
102
102
  getPropertiesAtLocation(...args) {
103
- return sendTsRequest('_vue:getPropertiesAtLocation', args);
103
+ return sendTsServerRequest('_vue:getPropertiesAtLocation', args);
104
104
  },
105
105
  getDocumentHighlights(fileName, position) {
106
- return sendTsRequest('_vue:documentHighlights-full', {
106
+ return sendTsServerRequest('_vue:documentHighlights-full', {
107
107
  file: fileName,
108
108
  ...{ position },
109
109
  filesToSearch: [fileName],
110
110
  });
111
111
  },
112
112
  async getQuickInfoAtPosition(fileName, { line, character }) {
113
- const result = await sendTsRequest('_vue:' + ts.server.protocol.CommandTypes.Quickinfo, {
113
+ const result = await sendTsServerRequest('_vue:' + ts.server.protocol.CommandTypes.Quickinfo, {
114
114
  file: fileName,
115
115
  line: line + 1,
116
116
  offset: character + 1,
@@ -118,14 +118,14 @@ connection.onInitialize(params => {
118
118
  return ts.displayPartsToString(result?.displayParts ?? []);
119
119
  },
120
120
  }));
121
- async function sendTsRequest(command, args) {
121
+ async function sendTsServerRequest(command, args) {
122
122
  return await new Promise(resolve => {
123
123
  const requestId = ++tsserverRequestId;
124
124
  tsserverRequestHandlers.set(requestId, resolve);
125
125
  connection.sendNotification('tsserver/request', [requestId, command, args]);
126
126
  });
127
127
  }
128
- function createLs(server, tsconfig) {
128
+ function createProjectLanguageService(server, tsconfig) {
129
129
  const commonLine = tsconfig
130
130
  ? (0, language_core_1.createParsedCommandLine)(ts, ts.sys, tsconfig)
131
131
  : {
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@vue/language-server",
3
- "version": "3.0.0-beta.4",
3
+ "version": "3.0.0-beta.5",
4
4
  "license": "MIT",
5
5
  "files": [
6
6
  "**/*.js",
@@ -17,9 +17,9 @@
17
17
  },
18
18
  "dependencies": {
19
19
  "@volar/language-server": "2.4.15",
20
- "@vue/language-core": "3.0.0-beta.4",
21
- "@vue/language-service": "3.0.0-beta.4",
22
- "@vue/typescript-plugin": "3.0.0-beta.4",
20
+ "@vue/language-core": "3.0.0-beta.5",
21
+ "@vue/language-service": "3.0.0-beta.5",
22
+ "@vue/typescript-plugin": "3.0.0-beta.5",
23
23
  "vscode-uri": "^3.0.8"
24
24
  },
25
25
  "peerDependencies": {
@@ -29,5 +29,5 @@
29
29
  "@typescript/server-harness": "latest",
30
30
  "@volar/test-utils": "2.4.15"
31
31
  },
32
- "gitHead": "5cb41faacbfe2d9e2d64637c6c1ae8769d9cba3f"
32
+ "gitHead": "3a4648914c60c90444d939cf762a016a4318ca09"
33
33
  }