From 1cacde34962c0c03cfa2de5eb72b3dbbc772e992 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Tue, 23 Jan 2018 11:23:02 +0100 Subject: [PATCH] Revert "add 'configuration' (read uri/path) of workspace config file, #41408" This reverts commit 3ecef8c1dd1d23afdab60ee8a5ff0b7006498810. --- src/vs/platform/workspace/common/workspace.ts | 2 +- src/vs/workbench/api/node/extHost.protocol.ts | 1 - src/vs/workbench/api/node/extHostExtensionService.ts | 2 -- 3 files changed, 1 insertion(+), 4 deletions(-) diff --git a/src/vs/platform/workspace/common/workspace.ts b/src/vs/platform/workspace/common/workspace.ts index 1493935a0130b..af594644baea5 100644 --- a/src/vs/platform/workspace/common/workspace.ts +++ b/src/vs/platform/workspace/common/workspace.ts @@ -198,7 +198,7 @@ export class Workspace implements IWorkspace { } public toJSON(): IWorkspace { - return { id: this.id, folders: this.folders, name: this.name, configuration: this.configuration }; + return { id: this.id, folders: this.folders, name: this.name }; } } diff --git a/src/vs/workbench/api/node/extHost.protocol.ts b/src/vs/workbench/api/node/extHost.protocol.ts index faacf07efa71a..d4dcd03d36370 100644 --- a/src/vs/workbench/api/node/extHost.protocol.ts +++ b/src/vs/workbench/api/node/extHost.protocol.ts @@ -71,7 +71,6 @@ export interface IWorkspaceData { id: string; name: string; folders: { uri: UriComponents, name: string, index: number }[]; - configuration: UriComponents; } export interface IInitData { diff --git a/src/vs/workbench/api/node/extHostExtensionService.ts b/src/vs/workbench/api/node/extHostExtensionService.ts index 73a8df57d4e0a..d39a58a432e2f 100644 --- a/src/vs/workbench/api/node/extHostExtensionService.ts +++ b/src/vs/workbench/api/node/extHostExtensionService.ts @@ -22,7 +22,6 @@ import { Barrier } from 'vs/base/common/async'; import { ILogService } from 'vs/platform/log/common/log'; import { IEnvironmentService } from 'vs/platform/environment/common/environment'; import { ExtHostLogService } from 'vs/workbench/api/node/extHostLogService'; -import URI from 'vs/base/common/uri'; class ExtensionMemento implements IExtensionMemento { @@ -109,7 +108,6 @@ class ExtensionStoragePath { join(storagePath, 'meta.json'), JSON.stringify({ id: this._workspace.id, - configuration: URI.revive(this._workspace.configuration).toString(), name: this._workspace.name }, undefined, 2) );