Skip to content

Commit f7b1b18

Browse files
dibarbetdibarbet
authored
Merge pull request #5754 from dibarbet/dev/dibarbet/merge_lsp_tools_host
Merge internal fork of LSP tools host back
2 parents e958254 + ed81f81 commit f7b1b18

File tree

301 files changed

+16470
-4136
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

301 files changed

+16470
-4136
lines changed

‎.editorconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,11 @@ root = true
55

66
# 4 space indentation
77
[*]
8+
insert_final_newline = true
89
indent_style = space
910
indent_size = 4
1011
trim_trailing_whitespace = true
12+
max_line_length = 120
1113

1214
# 2 space indentation and utf-8 for *.yml, package.json, and .json files under src
1315
[{*.yml,package.json,*.json}]

‎.github/workflows/branch-merge.yml

Lines changed: 0 additions & 22 deletions
This file was deleted.

‎.github/workflows/ci.yml

Lines changed: 0 additions & 51 deletions
This file was deleted.

‎.github/workflows/release-ci.yml

Lines changed: 0 additions & 131 deletions
This file was deleted.

‎.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ bin
22
obj
33
node_modules
44
out
5+
.roslyn/
56
.omnisharp/
67
.omnisharp-*/
78
.vs/
@@ -26,5 +27,3 @@ coverage/
2627

2728
\.DS_Store
2829
vsix/
29-
30-
\.vscodeignore

‎.prettierrc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"singleQuote": true
3+
}

‎.vscode/launch.json

Lines changed: 82 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
"CODE_WORKSPACE_ROOT": "${workspaceRoot}",
5050
"CODE_TESTS_PATH": "${workspaceRoot}/out/test/featureTests",
5151
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
52-
"OSVC_SUITE": "featureTests"
52+
"OSVC_SUITE": "featureTests",
5353
},
5454
"sourceMaps": true,
5555
"outFiles": [
@@ -73,7 +73,8 @@
7373
"CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
7474
"CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/singleCsproj",
7575
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
76-
"OSVC_SUITE": "singleCsproj"
76+
"OSVC_SUITE": "singleCsproj",
77+
"OMNISHARP_ENGINE": "stdio",
7778
},
7879
"sourceMaps": true,
7980
"outFiles": [
@@ -97,7 +98,8 @@
9798
"CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
9899
"CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
99100
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
100-
"OSVC_SUITE": "BasicRazorApp2_1"
101+
"OSVC_SUITE": "BasicRazorApp2_1",
102+
"OMNISHARP_ENGINE": "stdio",
101103
},
102104
},
103105
{
@@ -116,7 +118,80 @@
116118
"CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
117119
"CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj",
118120
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
119-
"OSVC_SUITE": "slnWithCsproj"
121+
"OSVC_SUITE": "slnWithCsproj",
122+
"OMNISHARP_ENGINE": "stdio",
123+
},
124+
"stopOnEntry": false,
125+
"sourceMaps": true,
126+
"outFiles": [
127+
"${workspaceRoot}/dist/*.js"
128+
],
129+
"preLaunchTask": "buildDev"
130+
},
131+
{
132+
"name": "Launch singleCsproj Workspace Tests [LSP]",
133+
"type": "extensionHost",
134+
"request": "launch",
135+
"runtimeExecutable": "${execPath}",
136+
"args": [
137+
"--disable-extensions",
138+
"${workspaceRoot}/test/integrationTests/testAssets/singleCsproj",
139+
"--extensionDevelopmentPath=${workspaceRoot}",
140+
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
141+
],
142+
"env": {
143+
"CODE_WORKSPACE_ROOT": "${workspaceRoot}",
144+
"CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
145+
"CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/singleCsproj",
146+
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
147+
"OSVC_SUITE": "singleCsproj",
148+
"OMNISHARP_ENGINE": "lsp",
149+
},
150+
"stopOnEntry": false,
151+
"sourceMaps": true,
152+
"outFiles": [
153+
"${workspaceRoot}/dist/*.js"
154+
],
155+
"preLaunchTask": "buildDev"
156+
},
157+
{
158+
"name": "Launch razorcsproj Workspace Tests [LSP]",
159+
"type": "extensionHost",
160+
"request": "launch",
161+
"runtimeExecutable": "${execPath}",
162+
"args": [
163+
"--disable-extensions",
164+
"${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
165+
"--extensionDevelopmentPath=${workspaceRoot}",
166+
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
167+
],
168+
"env": {
169+
"CODE_WORKSPACE_ROOT": "${workspaceRoot}",
170+
"CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
171+
"CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
172+
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
173+
"OSVC_SUITE": "BasicRazorApp2_1",
174+
"OMNISHARP_ENGINE": "lsp",
175+
},
176+
},
177+
{
178+
"name": "Launch slnWithCsproj Workspace Tests [LSP]",
179+
"type": "extensionHost",
180+
"request": "launch",
181+
"runtimeExecutable": "${execPath}",
182+
"args": [
183+
"--disable-extensions",
184+
"${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj",
185+
"--extensionDevelopmentPath=${workspaceRoot}",
186+
"--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
187+
],
188+
"env": {
189+
"CODE_WORKSPACE_ROOT": "${workspaceRoot}",
190+
"CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
191+
"CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj",
192+
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
193+
"OSVC_SUITE": "slnWithCsproj",
194+
"OMNISHARP_ENGINE": "lsp",
120195
},
121196
"sourceMaps": true,
122197
"outFiles": [
@@ -140,7 +215,7 @@
140215
"CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
141216
"CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/slnFilterWithCsproj",
142217
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
143-
"OSVC_SUITE": "slnFilterWithCsproj"
218+
"OSVC_SUITE": "slnFilterWithCsproj",
144219
},
145220
"sourceMaps": true,
146221
"outFiles": [
@@ -164,7 +239,7 @@
164239
"CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
165240
"CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/slnWithGenerator",
166241
"CODE_EXTENSIONS_PATH": "${workspaceRoot}",
167-
"OSVC_SUITE": "slnWithGenerator"
242+
"OSVC_SUITE": "slnWithGenerator",
168243
},
169244
"sourceMaps": true,
170245
"outFiles": [
@@ -188,4 +263,4 @@
188263
"cwd": "${workspaceFolder}"
189264
}
190265
]
191-
}
266+
}

0 commit comments

Comments
 (0)