提交 ea22a06e 编写于 作者: S Sandeep Somavarapu

Fix #34834

上级 f37884c2
...@@ -238,12 +238,12 @@ export class PreferencesEditor extends BaseEditor { ...@@ -238,12 +238,12 @@ export class PreferencesEditor extends BaseEditor {
} }
private getSettingsConfigurationTarget(resource: URI): ConfigurationTarget { private getSettingsConfigurationTarget(resource: URI): ConfigurationTarget {
if (this.preferencesService.userSettingsResource.fsPath === resource.fsPath) { if (this.preferencesService.userSettingsResource.toString() === resource.toString()) {
return ConfigurationTarget.USER; return ConfigurationTarget.USER;
} }
const workspaceSettingsResource = this.preferencesService.workspaceSettingsResource; const workspaceSettingsResource = this.preferencesService.workspaceSettingsResource;
if (workspaceSettingsResource && workspaceSettingsResource.fsPath === resource.fsPath) { if (workspaceSettingsResource && workspaceSettingsResource.toString() === resource.toString()) {
return ConfigurationTarget.WORKSPACE; return ConfigurationTarget.WORKSPACE;
} }
...@@ -255,10 +255,10 @@ export class PreferencesEditor extends BaseEditor { ...@@ -255,10 +255,10 @@ export class PreferencesEditor extends BaseEditor {
} }
private getSettingsConfigurationTargetUri(resource: URI): URI { private getSettingsConfigurationTargetUri(resource: URI): URI {
if (this.preferencesService.userSettingsResource.fsPath === resource.fsPath) { if (this.preferencesService.userSettingsResource.toString() === resource.toString()) {
return resource; return resource;
} }
if (this.preferencesService.workspaceSettingsResource.fsPath === resource.fsPath) { if (this.preferencesService.workspaceSettingsResource.toString() === resource.toString()) {
return resource; return resource;
} }
...@@ -911,17 +911,17 @@ class SettingsEditorContribution extends AbstractSettingsEditorContribution impl ...@@ -911,17 +911,17 @@ class SettingsEditorContribution extends AbstractSettingsEditorContribution impl
return false; return false;
} }
if (this.preferencesService.userSettingsResource && this.preferencesService.userSettingsResource.fsPath === model.uri.fsPath) { if (this.preferencesService.userSettingsResource && this.preferencesService.userSettingsResource.toString() === model.uri.toString()) {
return true; return true;
} }
if (this.preferencesService.workspaceSettingsResource && this.preferencesService.workspaceSettingsResource.fsPath === model.uri.fsPath) { if (this.preferencesService.workspaceSettingsResource && this.preferencesService.workspaceSettingsResource.toString() === model.uri.toString()) {
return true; return true;
} }
for (const folder of this.workspaceContextService.getWorkspace().folders) { for (const folder of this.workspaceContextService.getWorkspace().folders) {
const folderSettingsResource = this.preferencesService.getFolderSettingsResource(folder.uri); const folderSettingsResource = this.preferencesService.getFolderSettingsResource(folder.uri);
if (folderSettingsResource && folderSettingsResource.fsPath === model.uri.fsPath) { if (folderSettingsResource && folderSettingsResource.toString() === model.uri.toString()) {
return true; return true;
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册