Adds settings and webview panel to Schemas

Eric Amodio · Eric Amodio · commit 928bc1332e77 · 2020-03-23T17:02:15.000-04:00
diff --git a/src/vs/base/common/network.ts b/src/vs/base/common/network.ts
@@ -55,6 +55,10 @@ export namespace Schemas {
 	export const userData = 'vscode-userdata';
 
 	export const vscodeCustomEditor = 'vscode-custom-editor';
+
+	export const vscodeSettings = 'vscode-settings';
+
+	export const webviewPanel = 'webview-panel';
 }
 
 class RemoteAuthoritiesImpl {
diff --git a/src/vs/workbench/contrib/timeline/browser/timelinePane.ts b/src/vs/workbench/contrib/timeline/browser/timelinePane.ts
@@ -38,6 +38,7 @@ import { fromNow } from 'vs/base/common/date';
 import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
 import { escapeRegExpCharacters } from 'vs/base/common/strings';
 import { Iterable } from 'vs/base/common/iterator';
+import { Schemas } from 'vs/base/common/network';
 
 const PageSize = 20;
 
@@ -430,7 +431,7 @@ export class TimelinePane extends ViewPane {
 			}
 
 			// TODO@eamodio: Are these the right the list of schemes to exclude? Is there a better way?
-			if (this.uri?.scheme === 'vscode-settings' || this.uri?.scheme === 'webview-panel' || this.uri?.scheme === 'walkThrough') {
+			if (this.uri?.scheme === Schemas.vscodeSettings || this.uri?.scheme === Schemas.webviewPanel || this.uri?.scheme === Schemas.walkThrough) {
 				this.uri = undefined;
 
 				this.clear(false);
diff --git a/src/vs/workbench/contrib/webview/browser/webviewEditorInput.ts b/src/vs/workbench/contrib/webview/browser/webviewEditorInput.ts
@@ -7,8 +7,7 @@ import { Lazy } from 'vs/base/common/lazy';
 import { URI } from 'vs/base/common/uri';
 import { EditorInput, GroupIdentifier, IEditorInput, Verbosity } from 'vs/workbench/common/editor';
 import { IWebviewService, WebviewIcons, WebviewOverlay } from 'vs/workbench/contrib/webview/browser/webview';
-
-const WebviewPanelResourceScheme = 'webview-panel';
+import { Schemas } from 'vs/base/common/network';
 
 export class WebviewInput extends EditorInput {
 
@@ -24,7 +23,7 @@ export class WebviewInput extends EditorInput {
 
 	get resource() {
 		return URI.from({
-			scheme: WebviewPanelResourceScheme,
+			scheme: Schemas.webviewPanel,
 			path: `webview-panel/webview-${this.id}`
 		});
 	}
diff --git a/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts b/src/vs/workbench/services/preferences/common/preferencesEditorInput.ts
@@ -19,6 +19,7 @@ import { IEditorGroupsService } from 'vs/workbench/services/editor/common/editor
 import { IFileService } from 'vs/platform/files/common/files';
 import { ILabelService } from 'vs/platform/label/common/label';
 import { IFilesConfigurationService } from 'vs/workbench/services/filesConfiguration/common/filesConfigurationService';
+import { Schemas } from 'vs/base/common/network';
 
 export class PreferencesEditorInput extends SideBySideEditorInput {
 	static readonly ID: string = 'workbench.editorinputs.preferencesEditorInput';
@@ -105,7 +106,7 @@ export class SettingsEditor2Input extends EditorInput {
 	private readonly _settingsModel: Settings2EditorModel;
 
 	readonly resource: URI = URI.from({
-		scheme: 'vscode-settings',
+		scheme: Schemas.vscodeSettings,
 		path: `settingseditor`
 	});
 

Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,10 @@ export namespace Schemas {`
`55`	`55`	`export const userData = 'vscode-userdata';`
`56`	`56`
`57`	`57`	`export const vscodeCustomEditor = 'vscode-custom-editor';`
	`58`	`+`
	`59`	`+ export const vscodeSettings = 'vscode-settings';`
	`60`	`+`
	`61`	`+ export const webviewPanel = 'webview-panel';`
`58`	`62`	`}`
`59`	`63`
`60`	`64`	`class RemoteAuthoritiesImpl {`