From a15b64050acf85ab7e02883577c0e8d59388fe48 Mon Sep 17 00:00:00 2001 From: Joao Moreno Date: Fri, 17 Jan 2020 11:55:45 +0100 Subject: [PATCH] repo pane: use proper uri for input model --- .../contrib/scm/browser/repositoryPane.ts | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/vs/workbench/contrib/scm/browser/repositoryPane.ts b/src/vs/workbench/contrib/scm/browser/repositoryPane.ts index 3b21c5e447a..5de50a95422 100644 --- a/src/vs/workbench/contrib/scm/browser/repositoryPane.ts +++ b/src/vs/workbench/contrib/scm/browser/repositoryPane.ts @@ -65,6 +65,7 @@ import { format } from 'vs/base/common/strings'; import { inputPlaceholderForeground } from 'vs/platform/theme/common/colorRegistry'; import { SuggestController } from 'vs/editor/contrib/suggest/suggestController'; import { SnippetController2 } from 'vs/editor/contrib/snippet/snippetController2'; +import { Schemas } from 'vs/base/common/network'; type TreeElement = ISCMResourceGroup | IResourceNode | ISCMResource; @@ -735,7 +736,19 @@ export class RepositoryPane extends ViewPane { this._register(this.inputEditor.onDidFocusEditorText(() => addClass(editorContainer, 'synthetic-focus'))); this._register(this.inputEditor.onDidBlurEditorText(() => removeClass(editorContainer, 'synthetic-focus'))); - this.inputModel = this.modelService.createModel('', null, URI.parse('scm:///input')); + let query: string | undefined; + + if (this.repository.provider.rootUri) { + query = `rootUri=${encodeURIComponent(this.repository.provider.rootUri.toString())}`; + } + + const uri = URI.from({ + scheme: Schemas.vscode, + path: `scm/${this.repository.provider.contextValue}/${this.repository.provider.id}/input`, + query + }); + + this.inputModel = this.modelService.createModel('', null, uri); this.inputEditor.setModel(this.inputModel); this.inputEditor.changeViewZones(accessor => { -- GitLab