Merge branch 'integration-testing' into folder-level-settings

psalm · Jul 24, 2023 · 469c756 · 469c756
2 parents 412c4f7 + 5bab2c8
commit 469c756
Show file tree

Hide file tree

Showing 7 changed files with 1,206 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@ dist
 node_modules/
 node_modules
 .DS_Store
-*.vsix
+*.vsix
+.vscode-test/
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,7 +11,8 @@
             "request": "launch",
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}",
-                "--disable-extensions"
+                "--disable-extensions",
+                "${workspaceFolder}/fixtures/multi-folder.code-workspace"
             ],
             "outFiles": ["${workspaceFolder}/dist/**/*.js"],
             "preLaunchTask": "${defaultBuildTask}"
@@ -22,7 +23,8 @@
             "request": "launch",
             "args": [
                 "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
+                "--extensionTestsPath=${workspaceFolder}/out/test/suite/index",
+                "${workspaceFolder}/fixtures/multi-folder.code-workspace"
             ],
             "outFiles": [
                 "${workspaceFolder}/out/**/*.js",