Change getWorkspaceConfig to getConfig

src/calva-fmt/src/extension.ts

@@ -9,7 +9,7 @@ import * as calvaConfig from '../../config';
 
 function getLanguageConfiguration(autoIndentOn: boolean): vscode.LanguageConfiguration {
     return {
-        onEnterRules: autoIndentOn && calvaConfig.getWorkspaceConfig().format ? [
+        onEnterRules: autoIndentOn && calvaConfig.getConfig().format ? [
             // When Calva is the formatter disable all vscode default indentation
             // (By outdenting a lot, which is the only way I have found that works)
             // TODO: Make it actually consider whether Calva is the formatter or not

src/config.ts

@@ -29,7 +29,7 @@ const documentSelector = [
 }
 
 // TODO find a way to validate the configs
-function getWorkspaceConfig() {
+function getConfig() {
     const configOptions = vscode.workspace.getConfiguration('calva');
     return {
         format: configOptions.get("formatOnSave"),
@@ -64,5 +64,5 @@ export {
     KEYBINDINGS_ENABLED_CONTEXT_KEY,
     documentSelector,
     ReplSessionType,
-    getWorkspaceConfig
+    getConfig
 }

src/custom-snippets.ts

@@ -5,7 +5,7 @@ import * as getText from './util/get-text';
 import * as namespace from './namespace';
 import * as outputWindow from './results-output/results-doc'
 import { customREPLCommandSnippet } from './evaluate';
-import { getWorkspaceConfig } from './config';
+import { getConfig } from './config';
 import * as replSession from './nrepl/repl-session';
 import * as evaluate from './evaluate';
 
@@ -20,15 +20,15 @@ async function evaluateCustomCodeSnippet(codeOrKey?: string): Promise<void> {
     const currentFilename = editor.document.fileName;
     let pickCounter = 0;
     let configErrors: { "name": string; "keys": string[]; }[] = [];
-    const globalSnippets = getWorkspaceConfig().customREPLCommandSnippetsGlobal as customREPLCommandSnippet[];
-    const workspaceSnippets = getWorkspaceConfig().customREPLCommandSnippetsWorkspace as customREPLCommandSnippet[];
-    const workspaceFolderSnippets = getWorkspaceConfig().customREPLCommandSnippetsWorkspaceFolder as customREPLCommandSnippet[];
+    const globalSnippets = getConfig().customREPLCommandSnippetsGlobal as customREPLCommandSnippet[];
+    const workspaceSnippets = getConfig().customREPLCommandSnippetsWorkspace as customREPLCommandSnippet[];
+    const workspaceFolderSnippets = getConfig().customREPLCommandSnippetsWorkspaceFolder as customREPLCommandSnippet[];
     let snippets = [
         ...(globalSnippets ? globalSnippets : []),
         ...(workspaceSnippets ? workspaceSnippets : []),
         ...(workspaceFolderSnippets ? workspaceFolderSnippets : [])];
     if (snippets.length < 1) {
-        snippets = getWorkspaceConfig().customREPLCommandSnippets;
+        snippets = getConfig().customREPLCommandSnippets;
     }
     const snippetsDict = {};
     const snippetsKeyDict = {};

src/evaluate.ts

@@ -13,7 +13,7 @@ import * as namespace from './namespace';
 import * as replHistory from './results-output/repl-history';
 import { formatAsLineComments } from './results-output/util';
 import { getStateValue } from '../out/cljs-lib/cljs-lib';
-import { getWorkspaceConfig } from './config';
+import { getConfig } from './config';
 import * as replSession from './nrepl/repl-session';
 import * as getText from './util/get-text';
 
@@ -48,7 +48,7 @@ function addAsComment(c: number, result: string, codeSelection: vscode.Selection
 }
 
 async function evaluateCode(code: string, options, selection?: vscode.Selection): Promise<void> {
-    const pprintOptions = options.pprintOptions || getWorkspaceConfig().prettyPrintingOptions;
+    const pprintOptions = options.pprintOptions || getConfig().prettyPrintingOptions;
     const line = options.line;
     const column = options.column;
     const filePath = options.filePath;
@@ -196,44 +196,44 @@ function _currentSelectionElseCurrentForm(editor: vscode.TextEditor): getText.Se
 function evaluateSelectionReplace(document = {}, options = {}) {
     evaluateSelection(document, Object.assign({}, options, {
         replace: true,
-        pprintOptions: getWorkspaceConfig().prettyPrintingOptions,
+        pprintOptions: getConfig().prettyPrintingOptions,
         selectionFn: _currentSelectionElseCurrentForm
     })).catch(printWarningForError);
 }
 
 function evaluateSelectionAsComment(document = {}, options = {}) {
     evaluateSelection(document, Object.assign({}, options, {
         comment: true,
-        pprintOptions: getWorkspaceConfig().prettyPrintingOptions,
+        pprintOptions: getConfig().prettyPrintingOptions,
         selectionFn: _currentSelectionElseCurrentForm
     })).catch(printWarningForError);
 }
 
 function evaluateTopLevelFormAsComment(document = {}, options = {}) {
     evaluateSelection(document, Object.assign({}, options, {
         comment: true,
-        pprintOptions: getWorkspaceConfig().prettyPrintingOptions,
+        pprintOptions: getConfig().prettyPrintingOptions,
         selectionFn: getText.currentTopLevelFormText
     })).catch(printWarningForError);
 }
 
 function evaluateTopLevelForm(document = {}, options = {}) {
     evaluateSelection(document, Object.assign({}, options, {
-        pprintOptions: getWorkspaceConfig().prettyPrintingOptions,
+        pprintOptions: getConfig().prettyPrintingOptions,
         selectionFn: getText.currentTopLevelFormText
     })).catch(printWarningForError);
 }
 
 function evaluateCurrentForm(document = {}, options = {}) {
     evaluateSelection(document, Object.assign({}, options, {
-        pprintOptions: getWorkspaceConfig().prettyPrintingOptions,
+        pprintOptions: getConfig().prettyPrintingOptions,
         selectionFn: _currentSelectionElseCurrentForm
     })).catch(printWarningForError);
 }
 
 function evaluateToCursor(document = {}, options = {}) {
     evaluateSelection(document, Object.assign({}, options, {
-        pprintOptions: getWorkspaceConfig().prettyPrintingOptions,
+        pprintOptions: getConfig().prettyPrintingOptions,
         selectionFn: (editor: vscode.TextEditor) => {
             let [selection, code] = getText.toStartOfList(editor);
             return [selection, `(${code})`]
@@ -351,7 +351,7 @@ async function togglePrettyPrint() {
 
 async function instrumentTopLevelForm() {
     evaluateSelection({}, {
-        pprintOptions: getWorkspaceConfig().prettyPrintingOptions,
+        pprintOptions: getConfig().prettyPrintingOptions,
         debug: true,
         selectionFn: getText.currentTopLevelFormText
     }).catch(printWarningForError);

src/extension.ts

@@ -36,7 +36,7 @@ async function onDidSave(document) {
     let {
         evaluate,
         test,
-    } = config.getWorkspaceConfig();
+    } = config.getConfig();
 
     if (document.languageId !== 'clojure') {
         return;
@@ -47,7 +47,7 @@ async function onDidSave(document) {
         state.analytics().logEvent("Calva", "OnSaveTest").send();
     } else if (evaluate) {
         if (!outputWindow.isResultsDoc(document)) {
-            await eval.loadFile(document, config.getWorkspaceConfig().prettyPrintingOptions);
+            await eval.loadFile(document, config.getConfig().prettyPrintingOptions);
             outputWindow.appendPrompt();
             state.analytics().logEvent("Calva", "OnSaveLoad").send();
         }
@@ -92,8 +92,8 @@ async function activate(context: vscode.ExtensionContext) {
     const vimExtension = vscode.extensions.getExtension('vscodevim.vim');
     const cljKondoExtension = vscode.extensions.getExtension('borkdude.clj-kondo');
     const cwConfig = vscode.workspace.getConfiguration('clojureWarrior');
-    const customCljsRepl = config.getWorkspaceConfig().customCljsRepl;
-    const replConnectSequences = config.getWorkspaceConfig().replConnectSequences;
+    const customCljsRepl = config.getConfig().customCljsRepl;
+    const replConnectSequences = config.getConfig().replConnectSequences;
     const BUTTON_GOTO_DOC = "Open the docs";
     const BUTTON_OK = "Got it";
     const VIM_DOC_URL = "https://calva.io/vim/";
@@ -162,7 +162,7 @@ async function activate(context: vscode.ExtensionContext) {
     context.subscriptions.push(vscode.commands.registerCommand('calva.switchCljsBuild', connector.switchCljsBuild));
     context.subscriptions.push(vscode.commands.registerCommand('calva.selectCurrentForm', select.selectCurrentForm));
     context.subscriptions.push(vscode.commands.registerCommand('calva.loadFile', async () => {
-        await eval.loadFile({}, config.getWorkspaceConfig().prettyPrintingOptions);
+        await eval.loadFile({}, config.getConfig().prettyPrintingOptions);
         outputWindow.appendPrompt();
     }));
     context.subscriptions.push(vscode.commands.registerCommand('calva.interruptAllEvaluations', eval.interruptAllEvaluations));

src/lsp.ts

@@ -2,7 +2,7 @@ import * as vscode from 'vscode';
 import { LanguageClient, ServerOptions, LanguageClientOptions, DocumentSymbol, Position } from 'vscode-languageclient';
 import * as path from 'path';
 import * as util from './utilities'
-import { REPL_FILE_EXT, getWorkspaceConfig } from './config';
+import { REPL_FILE_EXT, getConfig } from './config';
 import { provideClojureDefinition } from './providers/definition';
 import { setStateValue, getStateValue } from '../out/cljs-lib/cljs-lib';
 
@@ -29,7 +29,7 @@ function createClient(jarPath: string): LanguageClient {
         },
         middleware: {
             handleDiagnostics(uri, diagnostics, next) {
-                if (!getWorkspaceConfig().displayDiagnostics) {
+                if (!getConfig().displayDiagnostics) {
                     return next(uri, []);
                 }
                 if (uri.path.endsWith(REPL_FILE_EXT)) {
@@ -41,13 +41,13 @@ function createClient(jarPath: string): LanguageClient {
                 return next(document, range, context, token);
             },
             provideCodeLenses: async (document, token, next): Promise<vscode.CodeLens[]> => {
-                if (getWorkspaceConfig().referencesCodeLensEnabled) {
+                if (getConfig().referencesCodeLensEnabled) {
                     return await next(document, token);
                 }
                 return [];
             },
             resolveCodeLens: async (codeLens, token, next) => {
-                if (getWorkspaceConfig().referencesCodeLensEnabled) {
+                if (getConfig().referencesCodeLensEnabled) {
                     return await next(codeLens, token);
                 }
                 return null;

src/nrepl/connectSequence.ts

@@ -1,7 +1,7 @@
 import * as vscode from "vscode";
 import * as state from "../state";
 import * as utilities from '../utilities';
-import { getWorkspaceConfig } from '../config';
+import { getConfig } from '../config';
 
 enum ProjectTypes {
     "Leiningen" = "Leiningen",
@@ -181,7 +181,7 @@ const defaultCljsTypes: { [id: string]: CljsTypeConfig } = {
 
 /** Retrieve the replConnectSequences from the config */
 function getCustomConnectSequences(): ReplConnectSequence[] {
-    let sequences: ReplConnectSequence[] = getWorkspaceConfig().replConnectSequences;
+    let sequences: ReplConnectSequence[] = getConfig().replConnectSequences;
 
     for (let sequence of sequences) {
         if (sequence.name == undefined ||
@@ -218,7 +218,7 @@ function getConnectSequences(projectTypes: string[]): ReplConnectSequence[] {
  */
 function getDefaultCljsType(cljsType: string): CljsTypeConfig {
     // TODO: Find a less hacky way to get dynamic config for lein-figwheel
-    defaultCljsTypes["lein-figwheel"].shouldOpenUrl = getWorkspaceConfig().openBrowserWhenFigwheelStarted;
+    defaultCljsTypes["lein-figwheel"].shouldOpenUrl = getConfig().openBrowserWhenFigwheelStarted;
     return defaultCljsTypes[cljsType];
 }
 

src/nrepl/index.ts

@@ -10,7 +10,7 @@ import * as outputWindow from '../results-output/results-doc';
 import { formatAsLineComments } from '../results-output/util';
 import type { ReplSessionType } from '../config';
 import { getStateValue, prettyPrint } from '../../out/cljs-lib/cljs-lib';
-import { getWorkspaceConfig } from '../config';
+import { getConfig } from '../config';
 
 /** An nREPL client */
 export class NReplClient {
@@ -360,7 +360,7 @@ export class NReplSession {
     complete(ns: string, symbol: string, context?: string) {
         return new Promise<any>((resolve, reject) => {
             const id = this.client.nextId,
-                extraOpts = getWorkspaceConfig().enableJSCompletions ? { "enhanced-cljs-completion?": "t" } : {};
+                extraOpts = getConfig().enableJSCompletions ? { "enhanced-cljs-completion?": "t" } : {};
             this.messageHandlers[id] = (msg) => {
                 resolve(msg);
                 return true;

src/nrepl/jack-in.ts

@@ -12,7 +12,7 @@ import * as projectTypes from './project-types';
 import * as outputWindow from '../results-output/results-doc';
 import { JackInTerminal, JackInTerminalOptions, createCommandLine } from "./jack-in-terminal";
 import * as liveShareSupport from '../liveShareSupport';
-import { getWorkspaceConfig } from '../config';
+import { getConfig } from '../config';
 
 let jackInPTY: JackInTerminal = undefined;
 let jackInTerminal: vscode.Terminal = undefined;
@@ -35,7 +35,7 @@ function resolveEnvVariables(entry: any): any {
 function getJackInEnv(): any {
     return {
         ...process.env,
-        ..._.mapValues(getWorkspaceConfig().jackInEnv as object, resolveEnvVariables)
+        ..._.mapValues(getConfig().jackInEnv as object, resolveEnvVariables)
     };
 }
 
@@ -68,7 +68,7 @@ async function executeJackInTask(terminalOptions: JackInTerminalOptions, connect
             cancelJackInTask();
         });
         jackInTerminal = (<any>vscode.window).createTerminal({ name: `Calva Jack-in: ${connectSequence.name}`, pty: jackInPTY });
-        if (getWorkspaceConfig().autoOpenJackInTerminal) {
+        if (getConfig().autoOpenJackInTerminal) {
             jackInTerminal.show();
         }
         jackInPTY.onDidClose((e) => {

src/nrepl/project-types.ts

@@ -3,7 +3,7 @@ import * as vscode from 'vscode';
 import * as path from 'path';
 import * as utilities from '../utilities';
 import * as pprint from '../printer';
-import { getWorkspaceConfig } from '../config';
+import { getConfig } from '../config';
 import { keywordize, unKeywordize } from '../util/string';
 import { CljsTypes, ReplConnectSequence } from './connectSequence';
 const { parseForms, parseEdn } = require('../../out/cljs-lib/cljs-lib');
@@ -160,7 +160,7 @@ async function leinProfilesAndAlias(defproject: any, connectSequence: ReplConnec
             profiles = launchProfiles.map(keywordize);
         } else {
             let projectProfiles = profilesIndex > -1 ? Object.keys(defproject[profilesIndex + 1]) : [];
-            const myProfiles = getWorkspaceConfig().myLeinProfiles;
+            const myProfiles = getConfig().myLeinProfiles;
             if (myProfiles && myProfiles.length) {
                 projectProfiles = [...projectProfiles, ...myProfiles];
             }
@@ -185,9 +185,9 @@ export enum JackInDependency {
     "cider/piggieback" = "cider/piggieback"
 }
 
-const NREPL_VERSION = () => getWorkspaceConfig().jackInDependencyVersions["nrepl"],
-    CIDER_NREPL_VERSION = () => getWorkspaceConfig().jackInDependencyVersions["cider-nrepl"],
-    PIGGIEBACK_VERSION = () => getWorkspaceConfig().jackInDependencyVersions["cider/piggieback"];
+const NREPL_VERSION = () => getConfig().jackInDependencyVersions["nrepl"],
+    CIDER_NREPL_VERSION = () => getConfig().jackInDependencyVersions["cider-nrepl"],
+    PIGGIEBACK_VERSION = () => getConfig().jackInDependencyVersions["cider/piggieback"];
 
 const cliDependencies = () => {
     return {
@@ -400,7 +400,7 @@ async function cljCommandLine(connectSequence: ReplConnectSequence, cljsType: Cl
         aliases = launchAliases.map(keywordize);
     } else {
         let projectAliases = parsed && parsed.aliases != undefined ? Object.keys(parsed.aliases) : [];
-        const myAliases = getWorkspaceConfig().myCljAliases;
+        const myAliases = getConfig().myCljAliases;
         if (myAliases && myAliases.length) {
             projectAliases = [...projectAliases, ...myAliases];
         }

src/nrepl/repl-start.ts

@@ -6,7 +6,7 @@ import * as utilities from "../utilities";
 import * as sequence from "./connectSequence";
 import * as jackIn from "./jack-in";
 import * as outputWindow from '../results-output/results-doc';
-import { getWorkspaceConfig } from '../config';
+import { getConfig } from '../config';
 import * as replSession from './repl-session';
 
 export const USER_TEMPLATE_FILE_NAMES = ['user.clj'];
@@ -90,7 +90,7 @@ export async function startStandaloneRepl(context: vscode.ExtensionContext, docN
 
     await jackIn.jackIn(sequence.genericDefaults[0], async () => {
         await vscode.window.showTextDocument(mainDoc, { preview: false, viewColumn: vscode.ViewColumn.One, preserveFocus: false });
-        await eval.loadFile({}, getWorkspaceConfig().prettyPrintingOptions);
+        await eval.loadFile({}, getConfig().prettyPrintingOptions);
         outputWindow.appendPrompt();
     });
 }

src/printer.ts

@@ -1,4 +1,4 @@
-import { getWorkspaceConfig } from './config';
+import { getConfig } from './config';
 
 export type PrettyPrintingOptions = {
     enabled: boolean,
@@ -58,7 +58,7 @@ export function getServerSidePrinter(pprintOptions: PrettyPrintingOptions) {
 }
 
 export function prettyPrintingOptions(): PrettyPrintingOptions {
-    return getWorkspaceConfig().prettyPrintingOptions;
+    return getConfig().prettyPrintingOptions;
 }
 
 export const zprintDependencies = {

src/providers/infoparser.ts

@@ -1,6 +1,6 @@
 import { SignatureInformation, ParameterInformation, MarkdownString } from 'vscode';
 import * as tokenCursor from '../cursor-doc/token-cursor';
-import { getWorkspaceConfig } from "../config";
+import { getConfig } from "../config";
 
 export class REPLInfoParser {
     private _name: string = undefined;
@@ -223,7 +223,7 @@ export class REPLInfoParser {
                             if (!this._specialForm && !argList.match(/\?/)) {
                                 signature.parameters = this.getParameters(symbol, argList);
                             }
-                            if (this._docString && getWorkspaceConfig().showDocstringInParameterHelp) {
+                            if (this._docString && getConfig().showDocstringInParameterHelp) {
                                 signature.documentation = this.formatDocString(this._docString);
                             }
                             return signature;

src/results-output/results-doc.ts

@@ -126,7 +126,7 @@ export async function initResultsDoc(): Promise<vscode.TextDocument> {
     await vscode.workspace.applyEdit(edit);
     resultsDoc.save();
 
-    if (config.getWorkspaceConfig().autoOpenREPLWindow) {
+    if (config.getConfig().autoOpenREPLWindow) {
         const resultsEditor = await vscode.window.showTextDocument(resultsDoc, getViewColumn(), true);
         const firstPos = resultsEditor.document.positionAt(0);
         const lastPos = resultsDoc.positionAt(Infinity);

src/status.ts

@@ -1,7 +1,7 @@
 import * as vscode from 'vscode';
 import statusbar from './statusbar';
 import * as state from './state';
-import { getWorkspaceConfig } from './config';
+import { getConfig } from './config';
 import { updateReplSessionType } from './nrepl/repl-session';
 
 function updateNeedReplUi(isNeeded: boolean, context = state.extensionContext) {
@@ -10,7 +10,7 @@ function updateNeedReplUi(isNeeded: boolean, context = state.extensionContext) {
 }
 
 function shouldshowReplUi(context = state.extensionContext): boolean {
-    return context.workspaceState.get('needReplUi') || !getWorkspaceConfig().hideReplUi;
+    return context.workspaceState.get('needReplUi') || !getConfig().hideReplUi;
 }
 
 function update(context = state.extensionContext) {