Skip to content

Commit

Permalink
fixes #91310
Browse files Browse the repository at this point in the history
  • Loading branch information
joaomoreno committed Apr 9, 2020
1 parent 1591086 commit 60b8f61
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/vs/workbench/contrib/scm/browser/repositoryPane.ts
Expand Up @@ -72,6 +72,7 @@ import { LinkDetector } from 'vs/editor/contrib/links/links';
import { IOpenerService } from 'vs/platform/opener/common/opener';
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
import { IListAccessibilityProvider } from 'vs/base/browser/ui/list/listWidget';
import { IModeService } from 'vs/editor/common/services/modeService';

type TreeElement = ISCMResourceGroup | IResourceNode<ISCMResource, ISCMResourceGroup> | ISCMResource;

Expand Down Expand Up @@ -649,6 +650,7 @@ export class RepositoryPane extends ViewPane {
@IMenuService protected menuService: IMenuService,
@IStorageService private storageService: IStorageService,
@IModelService private modelService: IModelService,
@IModeService private modeService: IModeService,
@IOpenerService openerService: IOpenerService,
@ITelemetryService telemetryService: ITelemetryService,
) {
Expand Down Expand Up @@ -786,7 +788,9 @@ export class RepositoryPane extends ViewPane {
});

this.configurationService.updateValue('editor.wordBasedSuggestions', false, { resource: uri }, ConfigurationTarget.MEMORY);
this.inputModel = this.modelService.getModel(uri) || this.modelService.createModel('', null, uri);

const mode = this.modeService.create('scminput');
this.inputModel = this.modelService.getModel(uri) || this.modelService.createModel('', mode, uri);
this.inputEditor.setModel(this.inputModel);

this._register(this.inputEditor.onDidChangeCursorPosition(triggerValidation));
Expand Down
7 changes: 7 additions & 0 deletions src/vs/workbench/contrib/scm/browser/scm.contribution.ts
Expand Up @@ -26,6 +26,7 @@ import { SCMService } from 'vs/workbench/contrib/scm/common/scmService';
import { IViewContainersRegistry, ViewContainerLocation, Extensions as ViewContainerExtensions } from 'vs/workbench/common/views';
import { SCMViewPaneContainer } from 'vs/workbench/contrib/scm/browser/scmViewlet';
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors';
import { ModesRegistry } from 'vs/editor/common/modes/modesRegistry';

class OpenSCMViewletAction extends ShowViewletAction {

Expand All @@ -37,6 +38,12 @@ class OpenSCMViewletAction extends ShowViewletAction {
}
}

ModesRegistry.registerLanguage({
id: 'scminput',
extensions: [],
mimetypes: ['text/x-scm-input']
});

Registry.as<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench)
.registerWorkbenchContribution(DirtyDiffWorkbenchController, LifecyclePhase.Restored);

Expand Down

0 comments on commit 60b8f61

Please sign in to comment.