提交 861e040e 编写于 作者: B Benjamin Pasero

debt - do not check for canHandleResource right on startup (for #48275)

上级 1678a450
...@@ -1118,7 +1118,7 @@ export class Workbench extends Disposable implements IPartService { ...@@ -1118,7 +1118,7 @@ export class Workbench extends Disposable implements IPartService {
get onEditorLayout(): Event<IDimension> { return this.editorPart.onDidLayout; } get onEditorLayout(): Event<IDimension> { return this.editorPart.onDidLayout; }
isCreated(): boolean { isCreated(): boolean {
return this.workbenchCreated && this.workbenchStarted; return !!(this.workbenchCreated && this.workbenchStarted);
} }
hasFocus(part: Parts): boolean { hasFocus(part: Parts): boolean {
......
...@@ -32,6 +32,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti ...@@ -32,6 +32,7 @@ import { IInstantiationService } from 'vs/platform/instantiation/common/instanti
import { ResourceGlobMatcher } from 'vs/workbench/electron-browser/resources'; import { ResourceGlobMatcher } from 'vs/workbench/electron-browser/resources';
import { Schemas } from 'vs/base/common/network'; import { Schemas } from 'vs/base/common/network';
import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor'; import { EditorServiceImpl } from 'vs/workbench/browser/parts/editor/editor';
import { IPartService } from 'vs/workbench/services/part/common/partService';
/** /**
* Stores the selection & view state of an editor and allows to compare it to other selection states. * Stores the selection & view state of an editor and allows to compare it to other selection states.
...@@ -132,6 +133,7 @@ export class HistoryService extends Disposable implements IHistoryService { ...@@ -132,6 +133,7 @@ export class HistoryService extends Disposable implements IHistoryService {
@IFileService private fileService: IFileService, @IFileService private fileService: IFileService,
@IWindowsService private windowService: IWindowsService, @IWindowsService private windowService: IWindowsService,
@IInstantiationService private instantiationService: IInstantiationService, @IInstantiationService private instantiationService: IInstantiationService,
@IPartService private partService: IPartService
) { ) {
super(); super();
...@@ -658,7 +660,12 @@ export class HistoryService extends Disposable implements IHistoryService { ...@@ -658,7 +660,12 @@ export class HistoryService extends Disposable implements IHistoryService {
if (arg2 instanceof EditorInput) { if (arg2 instanceof EditorInput) {
const inputResource = arg2.getResource(); const inputResource = arg2.getResource();
return inputResource && this.fileService.canHandleResource(inputResource) && inputResource.toString() === resource.toString(); let isSupportedFile = true;
if (this.partService.isCreated() && !this.fileService.canHandleResource(inputResource)) {
isSupportedFile = false; // make sure to only check this when workbench has started (for https://github.com/Microsoft/vscode/issues/48275)
}
return inputResource && isSupportedFile && inputResource.toString() === resource.toString();
} }
const resourceInput = arg2 as IResourceInput; const resourceInput = arg2 as IResourceInput;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册