Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-08-29 17:41:32 +01:00
Code Issues Packages Projects Releases Wiki Activity

Maintain editor category and step when no walkthrough found (#189873)

Browse Source 
* Maintain editor category and step when no walkthrough found

* Remove unused import
This commit is contained in:
Bhavya U
2023-08-07 16:35:51 -07:00
committed by GitHub
parent d0ff4f5353
commit 356a0ecb3e
2 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.contribution.ts
+2 -2
View File
@@ -10,7 +10,7 @@ import { EditorExtensions, IEditorFactoryRegistry } from 'vs/workbench/common/ed
import { MenuId, registerAction2, Action2 } from 'vs/platform/actions/common/actions';
import { IInstantiationService, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
import { ContextKeyExpr, IContextKeyService, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
import { IEditorService, SIDE_GROUP } from 'vs/workbench/services/editor/common/editorService';
import { IEditorService } from 'vs/workbench/services/editor/common/editorService';
import { KeybindingWeight } from 'vs/platform/keybinding/common/keybindingsRegistry';
import { KeyCode } from 'vs/base/common/keyCodes';
import { EditorPaneDescriptor, IEditorPaneRegistry } from 'vs/workbench/browser/editor';
@@ -106,7 +106,7 @@ registerAction2(class extends Action2 {
editorService.openEditor({
resource: GettingStartedInput.RESOURCE,
options: <GettingStartedEditorOptions>{ selectedCategory: selectedCategory, selectedStep: selectedStep, preserveFocus: toSide ?? false }
}, toSide ? SIDE_GROUP : undefined);
});
}
} else {
editorService.openEditor({ resource: GettingStartedInput.RESOURCE });
src/vs/workbench/contrib/welcomeGettingStarted/browser/gettingStarted.ts
+5 -10
View File
@@ -851,16 +851,11 @@ export class GettingStartedPage extends EditorPane {
if (!this.currentWalkthrough) {
this.gettingStartedCategories = this.gettingStartedService.getWalkthroughs();
this.currentWalkthrough = this.gettingStartedCategories.find(category => category.id === this.editorInput.selectedCategory);
}
if (!this.currentWalkthrough) {
console.error('Could not restore to category ' + this.editorInput.selectedCategory + ' as it was not found');
this.editorInput.selectedCategory = undefined;
this.editorInput.selectedStep = undefined;
} else {
this.buildCategorySlide(this.editorInput.selectedCategory, this.editorInput.selectedStep);
this.setSlide('details');
return;
if (this.currentWalkthrough) {
this.buildCategorySlide(this.editorInput.selectedCategory, this.editorInput.selectedStep);
this.setSlide('details');
return;
}
}
}