Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-25 02:58:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

native json for exthost/mainthread-workspace, #40169

Browse Source
This commit is contained in:
Johannes Rieken
2017-12-14 10:37:58 +01:00
parent e20f08b291
commit 2e6578fc37
3 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/vs/workbench/node/extensionHostMain.ts
View File

@@ -26,6 +26,7 @@ import { IDisposable, dispose } from 'vs/base/common/lifecycle';
import { ILogService } from 'vs/platform/log/common/log';
import { IMessagePassingProtocol } from 'vs/base/parts/ipc/common/ipc';
import { RPCProtocol } from 'vs/workbench/services/extensions/node/rpcProtocol';
import URI from 'vs/base/common/uri';
// const nativeExit = process.exit.bind(process);
function patchProcess(allowExit: boolean) {
@@ -234,7 +235,7 @@ export class ExtensionHostMain {
// find exact path
for (const { uri } of this._workspace.folders) {
if (await pfs.exists(join(uri.fsPath, fileName))) {
if (await pfs.exists(join(URI.revive(uri).fsPath, fileName))) {
// the file was found
return (
this._extensionService.activateById(extensionId, new ExtensionActivatedByEvent(true, `workspaceContains:${fileName}`))
@@ -261,7 +262,7 @@ export class ExtensionHostMain {
includes[globPattern] = true;
});
const folderQueries = this._workspace.folders.map(folder => ({ folder: folder.uri }));
const folderQueries = this._workspace.folders.map(folder => ({ folder: URI.revive(folder.uri) }));
const config = this._extHostConfiguration.getConfiguration('search');
const useRipgrep = config.get('useRipgrep', true);
const followSymlinks = config.get('followSymlinks', true);