Skip to content

Commit 23594b2

Browse files
code-asherAkash Satheesan
authored andcommitted
Rename uri transformer using camel case
1 parent a445588 commit 23594b2

File tree

4 files changed

+12
-7
lines changed

4 files changed

+12
-7
lines changed

lib/vscode/src/vs/server/connection.ts

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import * as cp from 'child_process';
33
import { VSBuffer } from 'vs/base/common/buffer';
44
import { Emitter } from 'vs/base/common/event';
55
import { FileAccess } from 'vs/base/common/network';
6-
import { join } from 'vs/base/common/path';
76
import { INativeEnvironmentService } from 'vs/platform/environment/common/environment';
87
import { IRemoteExtensionHostStartParams } from 'vs/platform/remote/common/remoteAgentConnection';
98
import { getNlsConfiguration } from 'vs/server/nls';
@@ -168,10 +167,17 @@ export class ExtensionHostConnection extends Connection {
168167
this.logger.debug('Spawning extension host...');
169168
const proc = cp.fork(
170169
FileAccess.asFileUri('bootstrap-fork', require).fsPath,
171-
// While not technically necessary, makes it easier to tell which process
172-
// bootstrap-fork is executing. Can also do pkill -f extensionHost
173-
// Other spawns in the VS Code codebase behave similarly.
174-
[ '--type=extensionHost', `--uriTransformerPath=${join(FileAccess.asFileUri('bootstrap-fork', require).fsPath, '../../../../out/node/uri_transformer.js')}` ],
170+
[
171+
// While not technically necessary, adding --type makes it easier to
172+
// tell which process bootstrap-fork is executing. Can also do `pkill -f
173+
// extensionHost`. Other spawns in the VS Code codebase behave
174+
// similarly.
175+
'--type=extensionHost',
176+
// We can't use the symlinked uriTransformer in this same directory
177+
// because it gets compiled into AMD syntax and this path is imported
178+
// using Node's native require.
179+
`--uriTransformerPath=${FileAccess.asFileUri('vs/../../../../out/node/uriTransformer.js', require).fsPath}`
180+
],
175181
{
176182
env: {
177183
...process.env,
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
../../../../../src/node/uri_transformer.ts
1+
../../../../../src/node/uriTransformer.ts

lib/vscode/src/vs/server/util.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
import { URITransformer } from 'vs/base/common/uriIpc';
22
import rawURITransformerFactory = require('vs/server/uriTransformer');
33

4-
54
export const getUriTransformer = (remoteAuthority: string): URITransformer => {
65
return new URITransformer(rawURITransformerFactory(remoteAuthority));
76
};
File renamed without changes.

0 commit comments

Comments
 (0)