Make setting defaults consistent and remove bundledModulesPath setting

This wasn't a "setting" anyway because it wasn't settable.

Author: andyleejordan

package.json

@@ -584,7 +584,6 @@
         },
         "powershell.powerShellExePath": {
           "type": "string",
-          "default": "",
           "scope": "machine",
           "description": "REMOVED: Please use the \"powershell.powerShellAdditionalExePaths\" setting instead.",
           "deprecationMessage": "Please use the \"powershell.powerShellAdditionalExePaths\" setting instead."
@@ -653,7 +652,6 @@
         },
         "powershell.cwd": {
           "type": "string",
-          "default": null,
           "description": "An explicit start path where the PowerShell Extension Terminal will be launched. Both the PowerShell process's and the shell's location will be set to this directory. A fully resolved path must be provided!"
         },
         "powershell.scriptAnalysis.enable": {
@@ -811,6 +809,7 @@
         },
         "powershell.integratedConsole.forceClearScrollbackBuffer": {
           "type": "boolean",
+          "default": false,
           "description": "Use the vscode API to clear the terminal since that's the only reliable way to clear the scrollback buffer. Turn this on if you're used to 'Clear-Host' clearing scroll history as well as clear-terminal-via-lsp."
         },
         "powershell.integratedConsole.suppressStartupBanner": {
@@ -825,6 +824,7 @@
         },
         "powershell.developer.bundledModulesPath": {
           "type": "string",
+          "default": "../../PowerShellEditorServices/module",
           "description": "Specifies an alternate path to the folder containing modules that are bundled with the PowerShell extension (i.e. PowerShell Editor Services, PSScriptAnalyzer, Plaster)"
         },
         "powershell.developer.editorServicesLogLevel": {

src/session.ts

@@ -525,13 +525,14 @@ export class SessionManager implements Middleware {
     }
 
     private async getBundledModulesPath(): Promise<string> {
-        let bundledModulesPath = path.resolve(__dirname, this.sessionSettings.bundledModulesPath);
+        // Because the extension is always at `<root>/out/main.js`
+        let bundledModulesPath = path.resolve(__dirname, "../modules");
 
         if (this.extensionContext.extensionMode === vscode.ExtensionMode.Development) {
             const devBundledModulesPath = path.resolve(__dirname, this.sessionSettings.developer.bundledModulesPath);
 
             // Make sure the module's bin path exists
-            if (await utils.checkIfDirectoryExists(path.join(devBundledModulesPath, "PowerShellEditorServices/bin"))) {
+            if (await utils.checkIfDirectoryExists(devBundledModulesPath)) {
                 bundledModulesPath = devBundledModulesPath;
             } else {
                 void this.logger.writeAndShowWarning(

src/settings.ts

@@ -82,7 +82,6 @@ export interface ISettings {
     // This setting is no longer used but is here to assist in cleaning up the users settings.
     powerShellExePath: string | undefined;
     promptToUpdatePowerShell: boolean;
-    bundledModulesPath: string;
     startAsLoginShell: IStartAsLoginShellSettings;
     startAutomatically: boolean;
     enableProfileLoading: boolean;
@@ -117,10 +116,12 @@ export interface IIntegratedConsoleSettings {
 }
 
 export interface ISideBarSettings {
+    // TODO: add CommandExplorerExcludeFilter
     CommandExplorerVisibility: boolean;
 }
 
 export interface IPesterSettings {
+    // TODO: add codeLens property
     useLegacyCodeLens: boolean;
     outputVerbosity: string;
     debugOutputVerbosity: string;
@@ -161,7 +162,7 @@ export function load(): ISettings {
 
     const defaultCodeFoldingSettings: ICodeFoldingSettings = {
         enable: true,
-        showLastLine: false,
+        showLastLine: true,
     };
 
     const defaultCodeFormattingSettings: ICodeFormattingSettings = {
@@ -215,7 +216,10 @@ export function load(): ISettings {
         debugOutputVerbosity: "Diagnostic",
     };
 
-    // TODO: I believe all the defaults can be removed, as the `package.json` should supply them (and be the source of truth).
+    // TODO: I believe all the defaults can be removed, as the `package.json`
+    // should supply them (and be the source of truth). However, this proves
+    // fairly messy to do as it requires casting the configuration to unknown
+    // and then to `ISettings`. It could work but will take more testing.
     return {
         startAutomatically:
             configuration.get<boolean>("startAutomatically", true),
@@ -227,18 +231,16 @@ export function load(): ISettings {
             configuration.get<string>("powerShellExePath"),
         promptToUpdatePowerShell:
             configuration.get<boolean>("promptToUpdatePowerShell", true),
-        bundledModulesPath:
-            "../modules", // Because the extension is always at `<root>/out/main.js`
         enableProfileLoading:
-            configuration.get<boolean>("enableProfileLoading", false),
+            configuration.get<boolean>("enableProfileLoading", true),
         helpCompletion:
             configuration.get<string>("helpCompletion", CommentType.BlockComment),
         scriptAnalysis:
             configuration.get<IScriptAnalysisSettings>("scriptAnalysis", defaultScriptAnalysisSettings),
         debugging:
             configuration.get<IDebuggingSettings>("debugging", defaultDebuggingSettings),
         developer:
-            getWorkspaceSettingsWithDefaults<IDeveloperSettings>(configuration, "developer", defaultDeveloperSettings),
+            configuration.get<IDeveloperSettings>("developer", defaultDeveloperSettings),
         codeFolding:
             configuration.get<ICodeFoldingSettings>("codeFolding", defaultCodeFoldingSettings),
         codeFormatting:
@@ -264,7 +266,7 @@ export function load(): ISettings {
         enableReferencesCodeLens:
             configuration.get<boolean>("enableReferencesCodeLens", true),
         analyzeOpenDocumentsOnly:
-            configuration.get<boolean>("analyzeOpenDocumentsOnly", true),
+            configuration.get<boolean>("analyzeOpenDocumentsOnly", false),
     };
 }
 
@@ -303,19 +305,6 @@ export async function change(
     }
 }
 
-function getWorkspaceSettingsWithDefaults<TSettings>(
-    workspaceConfiguration: vscode.WorkspaceConfiguration,
-    settingName: string,
-    defaultSettings: TSettings): TSettings {
-
-    const importedSettings: TSettings = workspaceConfiguration.get<TSettings>(settingName, defaultSettings);
-
-    for (const setting in importedSettings) {
-        defaultSettings[setting] = importedSettings[setting];
-    }
-    return defaultSettings;
-}
-
 // We don't want to query the user more than once, so this is idempotent.
 let hasPrompted = false;