From 71d53cdf8baaad4e27777686cfa357a0a8732e50 Mon Sep 17 00:00:00 2001
From: charburgx <charburgx@gmail.com>
Date: Thu, 27 Oct 2022 02:33:17 -0500
Subject: [PATCH] chore: proper .vscode folder setup

---
 .gitignore                                    |  4 +++
 .vscode/{launch.json => launch.template.json} |  4 +--
 .../.vscode/extensions.json                   |  5 ----
 .../.vscode/launch.json                       | 28 -------------------
 .../.vscode/settings.json                     | 11 --------
 .../.vscode/tasks.json                        | 20 -------------
 .../src/commands.ts                           |  2 ++
 7 files changed, 8 insertions(+), 66 deletions(-)
 rename .vscode/{launch.json => launch.template.json} (91%)
 delete mode 100644 packages/typescript-explorer-vscode/.vscode/extensions.json
 delete mode 100644 packages/typescript-explorer-vscode/.vscode/launch.json
 delete mode 100644 packages/typescript-explorer-vscode/.vscode/settings.json
 delete mode 100644 packages/typescript-explorer-vscode/.vscode/tasks.json

diff --git a/.gitignore b/.gitignore
index 0ba213a..360cea1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,10 @@
 ### Tests ###
 tests/baselines/local
 
+## Environment ##
+.vscode/settings.json
+.vscode/launch.json
+
 ## Build ##
 out
 dist
diff --git a/.vscode/launch.json b/.vscode/launch.template.json
similarity index 91%
rename from .vscode/launch.json
rename to .vscode/launch.template.json
index fd2d978..926bb6d 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.template.json
@@ -18,8 +18,8 @@
             "type": "extensionHost",
             "request": "launch",
             "args": [
-                "--extensionDevelopmentPath=${workspaceFolder}/packages/typescript-explorer",
-                "--extensionTestsPath=${workspaceFolder}/packages/typescript-explorer/out/test/suite/index"
+                "--extensionDevelopmentPath=${workspaceFolder}/packages/typescript-explorer-vscode",
+                "--extensionTestsPath=${workspaceFolder}/packages/typescript-explorer-vscode/out/test/suite/index"
             ],
             "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
             "preLaunchTask": "${defaultBuildTask}"
diff --git a/packages/typescript-explorer-vscode/.vscode/extensions.json b/packages/typescript-explorer-vscode/.vscode/extensions.json
deleted file mode 100644
index b1a2d99..0000000
--- a/packages/typescript-explorer-vscode/.vscode/extensions.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": ["dbaeumer.vscode-eslint"]
-}
diff --git a/packages/typescript-explorer-vscode/.vscode/launch.json b/packages/typescript-explorer-vscode/.vscode/launch.json
deleted file mode 100644
index 06d1093..0000000
--- a/packages/typescript-explorer-vscode/.vscode/launch.json
+++ /dev/null
@@ -1,28 +0,0 @@
-// A launch configuration that compiles the extension and then opens it inside a new window
-// Use IntelliSense to learn about possible attributes.
-// Hover to view descriptions of existing attributes.
-// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Run Extension",
-            "type": "extensionHost",
-            "request": "launch",
-            "args": ["--extensionDevelopmentPath=${workspaceFolder}"],
-            "outFiles": ["${workspaceFolder}/out/**/*.js"],
-            "preLaunchTask": "${defaultBuildTask}"
-        },
-        {
-            "name": "Extension Tests",
-            "type": "extensionHost",
-            "request": "launch",
-            "args": [
-                "--extensionDevelopmentPath=${workspaceFolder}",
-                "--extensionTestsPath=${workspaceFolder}/out/test/suite/index"
-            ],
-            "outFiles": ["${workspaceFolder}/out/test/**/*.js"],
-            "preLaunchTask": "${defaultBuildTask}"
-        }
-    ]
-}
diff --git a/packages/typescript-explorer-vscode/.vscode/settings.json b/packages/typescript-explorer-vscode/.vscode/settings.json
deleted file mode 100644
index fa0a104..0000000
--- a/packages/typescript-explorer-vscode/.vscode/settings.json
+++ /dev/null
@@ -1,11 +0,0 @@
-// Place your settings in this file to overwrite default and user settings.
-{
-    "files.exclude": {
-        "out": false // set this to true to hide the "out" folder with the compiled JS files
-    },
-    "search.exclude": {
-        "out": true // set this to false to include "out" folder in search results
-    },
-    // Turn off tsc task auto detection since we have the necessary tasks as npm scripts
-    "typescript.tsc.autoDetect": "off"
-}
diff --git a/packages/typescript-explorer-vscode/.vscode/tasks.json b/packages/typescript-explorer-vscode/.vscode/tasks.json
deleted file mode 100644
index 5deb2bc..0000000
--- a/packages/typescript-explorer-vscode/.vscode/tasks.json
+++ /dev/null
@@ -1,20 +0,0 @@
-// See https://go.microsoft.com/fwlink/?LinkId=733558
-// for the documentation about the tasks.json format
-{
-    "version": "2.0.0",
-    "tasks": [
-        {
-            "type": "npm",
-            "script": "watch",
-            "problemMatcher": "$tsc-watch",
-            "isBackground": true,
-            "presentation": {
-                "reveal": "never"
-            },
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
-        }
-    ]
-}
diff --git a/packages/typescript-explorer-vscode/src/commands.ts b/packages/typescript-explorer-vscode/src/commands.ts
index f1fc41b..989e908 100644
--- a/packages/typescript-explorer-vscode/src/commands.ts
+++ b/packages/typescript-explorer-vscode/src/commands.ts
@@ -13,6 +13,8 @@ type CommandInfo = [id: string, handler: CommandHandler]
 
 const normalCommands: CommandInfo[] = []
 
+// TODO: refreshing on config should be done in config.ts, not here...
+
 const typeTreeViewCommands: RefreshableCommandInfo[] = [
     [
         "typescriptExplorer.typeTree.view.icons.enabled.toggle",