Rename setting to excludePathsFromActivation

Author: award999

assets/test/.vscode/settings.json

@@ -11,7 +11,7 @@
     "lldb.launch.terminal": "external",
     "lldb-dap.detachOnError": true,
     "swift.sourcekit-lsp.backgroundIndexing": "off",
-    "swift.exclude": {
+    "swift.excludePathsFromActivation": {
         "**/excluded": true
     }
 }

package.json

@@ -797,7 +797,7 @@
             "markdownDescription": "Disable the running of SourceKit-LSP.",
             "markdownDeprecationMessage": "**Deprecated**: Please use `#swift.sourcekit-lsp.disable#` instead."
           },
-          "swift.exclude": {
+          "swift.excludePathsFromActivation": {
             "type": "object",
             "additionalProperties": {
               "type": "boolean"

src/configuration.ts

@@ -491,10 +491,10 @@ const configuration = {
         return vscode.workspace.getConfiguration("swift").get<boolean>("disableSandbox", false);
     },
     /** Workspace folder glob patterns to exclude */
-    get exclude(): Record<string, boolean> {
+    get excludePathsFromActivation(): Record<string, boolean> {
         return vscode.workspace
             .getConfiguration("swift")
-            .get<Record<string, boolean>>("exclude", {});
+            .get<Record<string, boolean>>("excludePathsFromActivation", {});
     },
 };
 

src/utilities/filesystem.ts

@@ -87,7 +87,7 @@ export function expandFilePathTilde(
 function getDefaultExcludeList(): Record<string, boolean> {
     const config = vscode.workspace.getConfiguration("files");
     const vscodeExcludeList = config.get<{ [key: string]: boolean }>("exclude", {});
-    const swiftExcludeList = configuration.exclude;
+    const swiftExcludeList = configuration.excludePathsFromActivation;
     return { ...vscodeExcludeList, ...swiftExcludeList };
 }
 

test/unit-tests/sourcekit-lsp/LanguageClientManager.test.ts

@@ -69,7 +69,7 @@ suite("LanguageClientManager Suite", () => {
     const mockedVSCodeWindow = mockGlobalObject(vscode, "window");
     const mockedVSCodeExtensions = mockGlobalObject(vscode, "extensions");
     const mockedVSCodeWorkspace = mockGlobalObject(vscode, "workspace");
-    const excludeConfig = mockGlobalValue(configuration, "exclude");
+    const excludeConfig = mockGlobalValue(configuration, "excludePathsFromActivation");
     let changeConfigEmitter: AsyncEventEmitter<vscode.ConfigurationChangeEvent>;
     let createFilesEmitter: AsyncEventEmitter<vscode.FileCreateEvent>;
     let deleteFilesEmitter: AsyncEventEmitter<vscode.FileDeleteEvent>;

userdocs/userdocs.docc/Articles/Reference/settings.md

@@ -34,7 +34,7 @@ You can enable the `searchSubfoldersForPackages` setting so the Swift extension
 Additionally you can exclude individual packages from initializing:
 ```json
 {
-  "swift.exclude": {
+  "swift.excludePathsFromActivation": {
     "**/proj2": true,
     "**/aSubfolder": true,
     "**/aSubfolder/proj3": false,