part of microsoft#50760

Benjamin Pasero · Benjamin Pasero · commit e77bbc0af7cb · 2018-05-30T09:09:31.000+02:00
diff --git a/src/vs/workbench/parts/preferences/common/preferencesContribution.ts b/src/vs/workbench/parts/preferences/common/preferencesContribution.ts
@@ -21,6 +21,8 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'
 import { IEditorOpeningEvent } from 'vs/workbench/common/editor';
 import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';
 import { IConfigurationService } from 'vs/platform/configuration/common/configuration';
+import { isEqual } from 'vs/base/common/paths';
+import { isLinux } from 'vs/base/common/platform';
 
 const schemaRegistry = Registry.as<JSONContributionRegistry.IJSONContributionRegistry>(JSONContributionRegistry.Extensions.JSONContribution);
 
@@ -79,7 +81,7 @@ export class PreferencesContribution implements IWorkbenchContribution {
 		}
 
 		// Global User Settings File
-		if (resource.fsPath === this.environmentService.appSettingsPath) {
+		if (isEqual(resource.fsPath, this.environmentService.appSettingsPath, !isLinux)) {
 			return event.prevent(() => this.preferencesService.openGlobalSettings(event.options, event.position));
 		}
 
diff --git a/src/vs/workbench/services/textfile/common/textFileEditorModel.ts b/src/vs/workbench/services/textfile/common/textFileEditorModel.ts
@@ -32,6 +32,7 @@ import { ITextBufferFactory } from 'vs/editor/common/model';
 import { IHashService } from 'vs/workbench/services/hash/common/hashService';
 import { createTextBufferFactory } from 'vs/editor/common/model/textModel';
 import { INotificationService } from 'vs/platform/notification/common/notification';
+import { isLinux } from 'vs/base/common/platform';
 
 /**
  * The text file editor model listens to changes to its underlying code editor model and saves these changes through the file service back to the disk.
@@ -780,7 +781,7 @@ export class TextFileEditorModel extends BaseTextEditorModel implements ITextFil
 	private isSettingsFile(): boolean {
 
 		// Check for global settings file
-		if (this.resource.fsPath === this.environmentService.appSettingsPath) {
+		if (path.isEqual(this.resource.fsPath, this.environmentService.appSettingsPath, !isLinux)) {
 			return true;
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@ import { IEnvironmentService } from 'vs/platform/environment/common/environment'`
`21`	`21`	`import { IEditorOpeningEvent } from 'vs/workbench/common/editor';`
`22`	`22`	`import { IWorkspaceContextService, WorkbenchState } from 'vs/platform/workspace/common/workspace';`
`23`	`23`	`import { IConfigurationService } from 'vs/platform/configuration/common/configuration';`
	`24`	`+import { isEqual } from 'vs/base/common/paths';`
	`25`	`+import { isLinux } from 'vs/base/common/platform';`
`24`	`26`
`25`	`27`	`const schemaRegistry = Registry.as<JSONContributionRegistry.IJSONContributionRegistry>(JSONContributionRegistry.Extensions.JSONContribution);`
`26`	`28`
`@@ -79,7 +81,7 @@ export class PreferencesContribution implements IWorkbenchContribution {`
`79`	`81`	`}`
`80`	`82`
`81`	`83`	`// Global User Settings File`
`82`		`- if (resource.fsPath === this.environmentService.appSettingsPath) {`
	`84`	`+ if (isEqual(resource.fsPath, this.environmentService.appSettingsPath, !isLinux)) {`
`83`	`85`	`return event.prevent(() => this.preferencesService.openGlobalSettings(event.options, event.position));`
`84`	`86`	`}`
`85`	`87`