Skip to content

Commit 683f6a4

Browse files
Improved naming/language for extension setting
1 parent a87b655 commit 683f6a4

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -144,11 +144,11 @@
144144
"default": "",
145145
"markdownDescription": "Pass additional arguments to the language server."
146146
},
147-
"haskell.envVars": {
147+
"haskell.serverEnvironment": {
148148
"scope": "resource",
149149
"type": "object",
150150
"default": {},
151-
"markdownDescription": "Define environment variables for compilation/execution."
151+
"markdownDescription": "Define environment variables for the language server."
152152
},
153153
"haskell.updateBehavior": {
154154
"scope": "machine",

src/extension.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -217,10 +217,10 @@ async function activateServerForFolder(context: ExtensionContext, uri: Uri, fold
217217
logger.info(`Activating the language server in the parent dir of the file: ${uri.fsPath}`);
218218
}
219219

220-
const envVars: IEnvVars = workspace.getConfiguration('haskell', uri).envVars;
220+
const serverEnvironment: IEnvVars = workspace.getConfiguration('haskell', uri).serverEnvironment;
221221
const exeOptions: ExecutableOptions = {
222222
cwd: folder ? undefined : path.dirname(uri.fsPath),
223-
env: Object.assign(process.env, envVars),
223+
env: Object.assign(process.env, serverEnvironment),
224224
};
225225

226226
// We don't want empty strings in our args

0 commit comments

Comments
 (0)