Merge pull request dotnet#36 from microsoft/merge-omnisharp-lsp-engine

Merge omnisharp-vscode/feature/lsp-engine into feature/lsp_tools_host
dibarbet · Oct 21, 2022 · 6f36b50 · 6f36b50
2 parents 08e2456 + fffc7d0
commit 6f36b50
Show file tree

Hide file tree

Showing 26 changed files with 1,267 additions and 481 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -5,9 +5,11 @@ root = true
 
 # 4 space indentation
 [*]
+insert_final_newline = true
 indent_style = space
 indent_size = 4
 trim_trailing_whitespace = true
+max_line_length = 120
 
 # 2 space indentation and utf-8 for *.yml, package.json, and .json files under src
 [{*.yml,package.json,*.json}]

diff --git a/.prettierrc b/.prettierrc
@@ -0,0 +1,3 @@
+{
+  "singleQuote": true
+}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -73,7 +73,8 @@
                 "CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
                 "CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/singleCsproj",
                 "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
-                "OSVC_SUITE": "singleCsproj"
+                "OSVC_SUITE": "singleCsproj",
+                "OMNISHARP_DRIVER": "stdio"
             },
             "sourceMaps": true,
             "outFiles": [
@@ -97,7 +98,8 @@
                 "CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
                 "CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
                 "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
-                "OSVC_SUITE": "BasicRazorApp2_1"
+                "OSVC_SUITE": "BasicRazorApp2_1",
+                "OMNISHARP_DRIVER": "stdio"
             },
         },
         {
@@ -116,7 +118,80 @@
                 "CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
                 "CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj",
                 "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
-                "OSVC_SUITE": "slnWithCsproj"
+                "OSVC_SUITE": "slnWithCsproj",
+                "OMNISHARP_DRIVER": "stdio"
+            },
+            "stopOnEntry": false,
+            "sourceMaps": true,
+            "outFiles": [
+                "${workspaceRoot}/dist/*.js"
+            ],
+            "preLaunchTask": "buildDev"
+        },
+        {
+            "name": "Launch singleCsproj Workspace Tests [LSP]",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--disable-extensions",
+                "${workspaceRoot}/test/integrationTests/testAssets/singleCsproj",
+                "--extensionDevelopmentPath=${workspaceRoot}",
+                "--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
+            ],
+            "env": {
+                "CODE_WORKSPACE_ROOT": "${workspaceRoot}",
+                "CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
+                "CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/singleCsproj",
+                "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
+                "OSVC_SUITE": "singleCsproj",
+                "OMNISHARP_DRIVER": "lsp"
+            },
+            "stopOnEntry": false,
+            "sourceMaps": true,
+            "outFiles": [
+                "${workspaceRoot}/dist/*.js"
+            ],
+            "preLaunchTask": "buildDev"
+        },
+        {
+            "name": "Launch razorcsproj Workspace Tests [LSP]",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--disable-extensions",
+                "${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
+                "--extensionDevelopmentPath=${workspaceRoot}",
+                "--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
+            ],
+            "env": {
+                "CODE_WORKSPACE_ROOT": "${workspaceRoot}",
+                "CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
+                "CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/BasicRazorApp2_1",
+                "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
+                "OSVC_SUITE": "BasicRazorApp2_1",
+                "OMNISHARP_DRIVER": "lsp"
+            },
+        },
+        {
+            "name": "Launch slnWithCsproj Workspace Tests [LSP]",
+            "type": "extensionHost",
+            "request": "launch",
+            "runtimeExecutable": "${execPath}",
+            "args": [
+                "--disable-extensions",
+                "${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj",
+                "--extensionDevelopmentPath=${workspaceRoot}",
+                "--extensionTestsPath=${workspaceRoot}/out/test/integrationTests"
+            ],
+            "env": {
+                "CODE_WORKSPACE_ROOT": "${workspaceRoot}",
+                "CODE_TESTS_PATH": "${workspaceRoot}/out/test/integrationTests",
+                "CODE_TESTS_WORKSPACE": "${workspaceRoot}/test/integrationTests/testAssets/slnWithCsproj",
+                "CODE_EXTENSIONS_PATH": "${workspaceRoot}",
+                "OSVC_SUITE": "slnWithCsproj",
+                "OMNISHARP_DRIVER": "lsp"
             },
             "sourceMaps": true,
             "outFiles": [

diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -2,23 +2,19 @@
     "editor.tabSize": 4,
     "editor.insertSpaces": true,
     "prettier.requireConfig": true,
-
     "files.exclude": {
-        "out": true,
         "typings": false,
         "vsix": true
     },
-
     "search.exclude": {
         "**/node_modules": true,
         "out/": true,
         "vsix/": true
     },
-
     "csharp.suppressDotnetRestoreNotification": true,
-
     "tslint.rulesDirectory": "node_modules/tslint-microsoft-contrib",
     "typescript.tsdk": "./node_modules/typescript/lib",
     "mocha.enabled": true,
-    "omnisharp.autoStart": false
-}
+    "omnisharp.autoStart": false,
+    "editor.formatOnSave": false
+}
diff --git a/package-lock.json b/package-lock.json