Skip to content

Commit 477eb06

Browse files
fearthecowboyfearthecowboy
authored
Fix out-of-order message handling (#11212)
1 parent 62b27ea commit 477eb06

33 files changed

+6938
-6762
lines changed

‎Extension/.eslintrc.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,8 @@ module.exports = {
6262
"no-case-declarations": "off",
6363
"no-useless-escape": "off",
6464
"no-floating-decimal": "error",
65+
"keyword-spacing": ["error", { "before": true, "overrides": { "this": { "before": false } } }],
66+
"arrow-spacing": ["error", { "before": true, "after": true }],
6567
"@typescript-eslint/no-for-in-array": "error",
6668
"@typescript-eslint/no-misused-new": "error",
6769
"@typescript-eslint/no-misused-promises": "error",
@@ -85,6 +87,8 @@ module.exports = {
8587
"@typescript-eslint/no-unnecessary-boolean-literal-compare": "error",
8688
"arrow-body-style": "error",
8789
"comma-dangle": "error",
90+
"comma-spacing": "off",
91+
"@typescript-eslint/comma-spacing": "error",
8892
"constructor-super": "error",
8993
"curly": "error",
9094
"eol-last": "error",

‎Extension/.vscode/launch.json

Lines changed: 141 additions & 141 deletions
Original file line numberDiff line numberDiff line change
@@ -1,143 +1,143 @@
11
// A launch configuration that compiles the extension and then opens it inside a new window
22
{
3-
"version": "0.1.0",
4-
"configurations": [
5-
{
6-
"name": "Launch Extension (development)",
7-
"type": "extensionHost",
8-
"request": "launch",
9-
"runtimeExecutable": "${execPath}",
10-
"args": [
11-
"--extensionDevelopmentPath=${workspaceFolder}"
12-
],
13-
"sourceMaps": true,
14-
"outFiles": [
15-
"${workspaceFolder}/dist/**/*.js"
16-
],
17-
"preLaunchTask": "Compile Dev",
18-
},
19-
{
20-
"name": "Launch Extension (production)",
21-
"type": "extensionHost",
22-
"request": "launch",
23-
"runtimeExecutable": "${execPath}",
24-
"args": [
25-
"--extensionDevelopmentPath=${workspaceFolder}"
26-
],
27-
"sourceMaps": true,
28-
"outFiles": [
29-
"${workspaceFolder}/dist/**/*.js"
30-
],
31-
"preLaunchTask": "TypeScript Compile",
32-
},
33-
{
34-
"name": "Launch Extension (do not build)",
35-
"type": "extensionHost",
36-
"request": "launch",
37-
"runtimeExecutable": "${execPath}",
38-
"args": [
39-
"--extensionDevelopmentPath=${workspaceFolder}"
40-
],
41-
"sourceMaps": true,
42-
"outFiles": [
43-
"${workspaceFolder}/dist/**/*.js"
44-
]
45-
},
46-
{
47-
"name": "Launch Extension (watch, development)",
48-
"type": "extensionHost",
49-
"request": "launch",
50-
"runtimeExecutable": "${execPath}",
51-
"args": [
52-
"--extensionDevelopmentPath=${workspaceFolder}"
53-
],
54-
"sourceMaps": true,
55-
"outFiles": [
56-
"${workspaceFolder}/dist/**/*.js"
57-
],
58-
"preLaunchTask": "Compile Dev Watch",
59-
},
60-
{
61-
"name": "Launch Extension (watch, production)",
62-
"type": "extensionHost",
63-
"request": "launch",
64-
"runtimeExecutable": "${execPath}",
65-
"args": [
66-
"--extensionDevelopmentPath=${workspaceFolder}"
67-
],
68-
"sourceMaps": true,
69-
"outFiles": [
70-
"${workspaceFolder}/dist/**/*.js"
71-
],
72-
"preLaunchTask": "TypeScript Compile Watch",
73-
},
74-
{
75-
"name": "Launch Unit Tests",
76-
"type": "extensionHost",
77-
"request": "launch",
78-
"runtimeExecutable": "${execPath}",
79-
"args": [
80-
"--extensionDevelopmentPath=${workspaceFolder}",
81-
"--extensionTestsPath=${workspaceFolder}/out/test/unitTests/index"
82-
],
83-
"sourceMaps": true,
84-
"outFiles": [
85-
"${workspaceFolder}/out/test/**/*.js"
86-
],
87-
"preLaunchTask": "Pretest"
88-
},
89-
{
90-
"name": "Launch Integration Tests",
91-
"type": "extensionHost",
92-
"request": "launch",
93-
"runtimeExecutable": "${execPath}",
94-
"args": [
95-
"${workspaceFolder}/test/integrationTests/testAssets/SimpleCppProject/simpleCppProject.code-workspace",
96-
"--extensionDevelopmentPath=${workspaceFolder}",
97-
"--extensionTestsPath=${workspaceFolder}/out/test/integrationTests/languageServer/index"
98-
],
99-
"sourceMaps": true,
100-
"outFiles": [
101-
"${workspaceFolder}/out/test/**/*.js"
102-
],
103-
"preLaunchTask": "Pretest",
104-
},
105-
{
106-
"name": "Launch E2E IntelliSense features tests",
107-
"type": "extensionHost",
108-
"request": "launch",
109-
"runtimeExecutable": "${execPath}",
110-
"args": [
111-
"C:/git/Vcls-vscode-test/MultirootDeadlockTest/test.code-workspace",
112-
"--extensionDevelopmentPath=${workspaceFolder}",
113-
"--extensionTestsPath=${workspaceFolder}/out/test/integrationTests/IntelliSenseFeatures/index"
114-
],
115-
"sourceMaps": true,
116-
"outFiles": [
117-
"${workspaceFolder}/out/test/**/*.js"
118-
],
119-
"preLaunchTask": "Pretest"
120-
},
121-
{
122-
"name": "Node Attach",
123-
"type": "node",
124-
"request": "attach",
125-
"port": 5858
126-
},
127-
{
128-
"name": "MochaTest",
129-
"type": "node",
130-
"request": "attach",
131-
"port": 9229,
132-
"continueOnAttach": true,
133-
"autoAttachChildProcesses": false,
134-
"skipFiles": [
135-
"<node_internals>/**"
136-
],
137-
"outFiles": [
138-
"${workspaceFolder}/**/out/**/*.js",
139-
"!**/node_modules/**"
140-
]
141-
}
142-
]
143-
}
3+
"version": "0.1.0",
4+
"configurations": [
5+
{
6+
"name": "Launch Extension (development)",
7+
"type": "extensionHost",
8+
"request": "launch",
9+
"runtimeExecutable": "${execPath}",
10+
"args": [
11+
"--extensionDevelopmentPath=${workspaceFolder}"
12+
],
13+
"sourceMaps": true,
14+
"outFiles": [
15+
"${workspaceFolder}/dist/**/*.js"
16+
],
17+
"preLaunchTask": "Compile Dev",
18+
},
19+
{
20+
"name": "Launch Extension (production)",
21+
"type": "extensionHost",
22+
"request": "launch",
23+
"runtimeExecutable": "${execPath}",
24+
"args": [
25+
"--extensionDevelopmentPath=${workspaceFolder}"
26+
],
27+
"sourceMaps": true,
28+
"outFiles": [
29+
"${workspaceFolder}/dist/**/*.js"
30+
],
31+
"preLaunchTask": "TypeScript Compile",
32+
},
33+
{
34+
"name": "Launch Extension (do not build)",
35+
"type": "extensionHost",
36+
"request": "launch",
37+
"runtimeExecutable": "${execPath}",
38+
"args": [
39+
"--extensionDevelopmentPath=${workspaceFolder}"
40+
],
41+
"sourceMaps": true,
42+
"outFiles": [
43+
"${workspaceFolder}/dist/**/*.js"
44+
]
45+
},
46+
{
47+
"name": "Launch Extension (watch, development)",
48+
"type": "extensionHost",
49+
"request": "launch",
50+
"runtimeExecutable": "${execPath}",
51+
"args": [
52+
"--extensionDevelopmentPath=${workspaceFolder}"
53+
],
54+
"sourceMaps": true,
55+
"outFiles": [
56+
"${workspaceFolder}/dist/**/*.js"
57+
],
58+
"preLaunchTask": "Compile Dev Watch",
59+
},
60+
{
61+
"name": "Launch Extension (watch, production)",
62+
"type": "extensionHost",
63+
"request": "launch",
64+
"runtimeExecutable": "${execPath}",
65+
"args": [
66+
"--extensionDevelopmentPath=${workspaceFolder}"
67+
],
68+
"sourceMaps": true,
69+
"outFiles": [
70+
"${workspaceFolder}/dist/**/*.js"
71+
],
72+
"preLaunchTask": "TypeScript Compile Watch",
73+
},
74+
{
75+
"name": "Launch Unit Tests",
76+
"type": "extensionHost",
77+
"request": "launch",
78+
"runtimeExecutable": "${execPath}",
79+
"args": [
80+
"--extensionDevelopmentPath=${workspaceFolder}",
81+
"--extensionTestsPath=${workspaceFolder}/out/test/unitTests/index"
82+
],
83+
"sourceMaps": true,
84+
"outFiles": [
85+
"${workspaceFolder}/out/test/**/*.js"
86+
],
87+
"preLaunchTask": "Pretest"
88+
},
89+
{
90+
"name": "Launch Integration Tests",
91+
"type": "extensionHost",
92+
"request": "launch",
93+
"runtimeExecutable": "${execPath}",
94+
"args": [
95+
"${workspaceFolder}/test/integrationTests/testAssets/SimpleCppProject/simpleCppProject.code-workspace",
96+
"--extensionDevelopmentPath=${workspaceFolder}",
97+
"--extensionTestsPath=${workspaceFolder}/out/test/integrationTests/languageServer/index"
98+
],
99+
"sourceMaps": true,
100+
"outFiles": [
101+
"${workspaceFolder}/out/test/**/*.js"
102+
],
103+
"preLaunchTask": "Pretest",
104+
},
105+
{
106+
"name": "Launch E2E IntelliSense features tests",
107+
"type": "extensionHost",
108+
"request": "launch",
109+
"runtimeExecutable": "${execPath}",
110+
"args": [
111+
"${workspaceFolder}/../../Vcls-vscode-test/MultirootDeadlockTest/test.code-workspace",
112+
"--extensionDevelopmentPath=${workspaceFolder}",
113+
"--extensionTestsPath=${workspaceFolder}/out/test/integrationTests/IntelliSenseFeatures/index"
114+
],
115+
"sourceMaps": true,
116+
"outFiles": [
117+
"${workspaceFolder}/out/test/**/*.js"
118+
],
119+
"preLaunchTask": "Pretest"
120+
},
121+
{
122+
"name": "Node Attach",
123+
"type": "node",
124+
"request": "attach",
125+
"port": 5858
126+
},
127+
{
128+
"name": "MochaTest",
129+
"type": "node",
130+
"request": "attach",
131+
"port": 9229,
132+
"continueOnAttach": true,
133+
"autoAttachChildProcesses": false,
134+
"skipFiles": [
135+
"<node_internals>/**"
136+
],
137+
"outFiles": [
138+
"${workspaceFolder}/**/out/**/*.js",
139+
"!**/node_modules/**"
140+
]
141+
}
142+
]
143+
}

‎Extension/.vscode/settings.json

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
"typescript.tsdk": "./node_modules/typescript/lib", // we want to use the TS server from our node_modules folder to control its version
1010
// if you install the mocha test explorer extension, you can run the unit tests from the test explorer UI
1111
"testExplorer.useNativeTesting": true,
12-
"mochaExplorer.files": "./**/internalUnitTests/**/test-*.js",
13-
"mochaExplorer.watch": "./**/internalUnitTests/**/test-*.js",
12+
"mochaExplorer.files": "./**/internalUnitTests/**/*.test.js",
13+
"mochaExplorer.watch": "./**/internalUnitTests/**/*.test.js",
1414
"mochaExplorer.ignore": [
1515
"**/*skip*",
1616
"**/dist/test/**/*.d.ts",
@@ -24,11 +24,13 @@
2424
],
2525
"mochaExplorer.monkeyPatch": true,
2626
"[json]": {
27+
"editor.formatOnSave": true,
2728
"editor.defaultFormatter": "vscode.json-language-features",
2829
"editor.tabSize": 4,
2930
"files.insertFinalNewline": true
3031
},
3132
"[jsonc]": {
33+
"editor.formatOnSave": true,
3234
"editor.defaultFormatter": "vscode.json-language-features",
3335
"editor.tabSize": 4,
3436
"files.insertFinalNewline": true

0 commit comments

Comments
 (0)