File tree Expand file tree Collapse file tree 1 file changed +2
-15
lines changed
packages/core/src/shared/lsp/utils Expand file tree Collapse file tree 1 file changed +2
-15
lines changed Original file line number Diff line number Diff line change 4
4
*/
5
5
6
6
import { ToolkitError } from '../../errors'
7
- import { Logger , getLogger } from '../../logger/logger'
7
+ import { Logger } from '../../logger/logger'
8
8
import { ChildProcess } from '../../utilities/processUtils'
9
9
import { waitUntil } from '../../utilities/timeoutUtils'
10
10
import { isDebugInstance } from '../../vscode/env'
@@ -87,14 +87,12 @@ export function createServerOptions({
87
87
serverModule,
88
88
execArgv,
89
89
warnThresholds,
90
- env,
91
90
} : {
92
91
encryptionKey : Buffer
93
92
executable : string [ ]
94
93
serverModule : string
95
94
execArgv : string [ ]
96
95
warnThresholds ?: { cpu ?: number ; memory ?: number }
97
- env ?: Record < string , string >
98
96
} ) {
99
97
return async ( ) => {
100
98
const bin = executable [ 0 ]
@@ -103,18 +101,7 @@ export function createServerOptions({
103
101
args . unshift ( '--inspect=6080' )
104
102
}
105
103
106
- // Merge environment variables
107
- const processEnv = { ...process . env }
108
- if ( env ) {
109
- Object . assign ( processEnv , env )
110
- }
111
-
112
- const lspProcess = new ChildProcess ( bin , args , {
113
- warnThresholds,
114
- spawnOptions : {
115
- env : processEnv ,
116
- } ,
117
- } )
104
+ const lspProcess = new ChildProcess ( bin , args , { warnThresholds } )
118
105
119
106
// this is a long running process, awaiting it will never resolve
120
107
void lspProcess . run ( )
You can’t perform that action at this time.
0 commit comments