From db6ebe93f8bbb77d0ff8e09cb6568c348a3dcdfb Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Thu, 11 Oct 2018 12:56:54 +0200 Subject: [PATCH] remove now obsolete code --- build/lib/i18n.resources.json | 4 - .../common/navigation.contribution.ts | 11 --- .../common/removedKeybindingsContribution.ts | 76 ------------------- src/vs/workbench/workbench.main.ts | 19 ++--- 4 files changed, 8 insertions(+), 102 deletions(-) delete mode 100644 src/vs/workbench/parts/navigation/common/navigation.contribution.ts delete mode 100644 src/vs/workbench/parts/navigation/common/removedKeybindingsContribution.ts diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json index 9afcbb24891..204ea6beea6 100644 --- a/build/lib/i18n.resources.json +++ b/build/lib/i18n.resources.json @@ -78,10 +78,6 @@ "name": "vs/workbench/parts/logs", "project": "vscode-workbench" }, - { - "name": "vs/workbench/parts/navigation", - "project": "vscode-workbench" - }, { "name": "vs/workbench/parts/output", "project": "vscode-workbench" diff --git a/src/vs/workbench/parts/navigation/common/navigation.contribution.ts b/src/vs/workbench/parts/navigation/common/navigation.contribution.ts deleted file mode 100644 index 1b09f14f1dc..00000000000 --- a/src/vs/workbench/parts/navigation/common/navigation.contribution.ts +++ /dev/null @@ -1,11 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import { Registry } from 'vs/platform/registry/common/platform'; -import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'; -import { LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; -import { HistoryNavigationKeybindingsChangedContribution } from 'vs/workbench/parts/navigation/common/removedKeybindingsContribution'; - -Registry.as(WorkbenchExtensions.Workbench).registerWorkbenchContribution(HistoryNavigationKeybindingsChangedContribution, LifecyclePhase.Eventually); \ No newline at end of file diff --git a/src/vs/workbench/parts/navigation/common/removedKeybindingsContribution.ts b/src/vs/workbench/parts/navigation/common/removedKeybindingsContribution.ts deleted file mode 100644 index a0ec0ee57f6..00000000000 --- a/src/vs/workbench/parts/navigation/common/removedKeybindingsContribution.ts +++ /dev/null @@ -1,76 +0,0 @@ -/*--------------------------------------------------------------------------------------------- - * Copyright (c) Microsoft Corporation. All rights reserved. - * Licensed under the MIT License. See License.txt in the project root for license information. - *--------------------------------------------------------------------------------------------*/ - -import { IWorkbenchContribution } from 'vs/workbench/common/contributions'; -import { INotificationService, Severity } from 'vs/platform/notification/common/notification'; -import { IKeybindingService } from 'vs/platform/keybinding/common/keybinding'; -import { IStorageService, StorageScope } from 'vs/platform/storage/common/storage'; -import { localize } from 'vs/nls'; -import { IPreferencesService } from 'vs/workbench/services/preferences/common/preferences'; - -// TODO@Sandeep remove me after a while -export class HistoryNavigationKeybindingsChangedContribution implements IWorkbenchContribution { - - private previousCommands: string[] = [ - - 'search.history.showNextIncludePattern', - 'search.history.showPreviousIncludePattern', - 'search.history.showNextExcludePattern', - 'search.history.showPreviousExcludePattern', - 'search.history.showNext', - 'search.history.showPrevious', - 'search.replaceHistory.showNext', - 'search.replaceHistory.showPrevious', - - 'find.history.showPrevious', - 'find.history.showNext', - - 'workbench.action.terminal.findWidget.history.showNext', - 'workbench.action.terminal.findWidget.history.showPrevious', - - 'editor.action.extensioneditor.showNextFindTerm', - 'editor.action.extensioneditor.showPreviousFindTerm', - - 'editor.action.webvieweditor.showNextFindTerm', - 'editor.action.webvieweditor.showPreviousFindTerm', - - 'repl.action.historyNext', - 'repl.action.historyPrevious' - ]; - - constructor( - @INotificationService private readonly notificationService: INotificationService, - @IKeybindingService private readonly keybindingService: IKeybindingService, - @IPreferencesService private readonly preferencesService: IPreferencesService, - @IStorageService private readonly storageService: IStorageService - ) { - this.showRemovedWarning(); - } - - private showRemovedWarning(): void { - const key = 'donotshow.historyNavigation.warning'; - if (!this.storageService.getBoolean(key, StorageScope.GLOBAL, false)) { - const keybindingsToRemove = this.keybindingService.getKeybindings().filter(keybinding => !keybinding.isDefault && this.previousCommands.indexOf(keybinding.command) !== -1); - if (keybindingsToRemove.length) { - const message = localize('showDeprecatedWarningMessage', "History navigation commands have changed. Please update your keybindings to use following new commands: 'history.showPrevious' and 'history.showNext'"); - this.notificationService.prompt(Severity.Warning, message, [ - { - label: localize('Open Keybindings', "Open Keybindings File"), - run: () => this.preferencesService.openGlobalKeybindingSettings(true) - }, - { - label: localize('more information', "More Information..."), - run: () => null - }, - { - label: localize('Do not show again', "Don't show again"), - isSecondary: true, - run: () => this.storageService.store(key, true, StorageScope.GLOBAL) - } - ]); - } - } - } -} diff --git a/src/vs/workbench/workbench.main.ts b/src/vs/workbench/workbench.main.ts index 521eef90c18..dbaf8bcf012 100644 --- a/src/vs/workbench/workbench.main.ts +++ b/src/vs/workbench/workbench.main.ts @@ -56,16 +56,16 @@ import 'vs/workbench/parts/stats/node/stats.contribution'; import 'vs/workbench/parts/splash/electron-browser/partsSplash.contribution'; import 'vs/workbench/parts/search/electron-browser/search.contribution'; -import 'vs/workbench/parts/search/browser/searchView'; // can be packaged separately -import 'vs/workbench/parts/search/browser/openAnythingHandler'; // can be packaged separately +import 'vs/workbench/parts/search/browser/searchView'; +import 'vs/workbench/parts/search/browser/openAnythingHandler'; import 'vs/workbench/parts/scm/electron-browser/scm.contribution'; -import 'vs/workbench/parts/scm/electron-browser/scmViewlet'; // can be packaged separately +import 'vs/workbench/parts/scm/electron-browser/scmViewlet'; import 'vs/workbench/parts/debug/electron-browser/debug.contribution'; import 'vs/workbench/parts/debug/browser/debugQuickOpen'; import 'vs/workbench/parts/debug/electron-browser/repl'; -import 'vs/workbench/parts/debug/browser/debugViewlet'; // can be packaged separately +import 'vs/workbench/parts/debug/browser/debugViewlet'; import 'vs/workbench/parts/markers/electron-browser/markers.contribution'; import 'vs/workbench/parts/comments/electron-browser/comments.contribution'; @@ -79,16 +79,16 @@ import 'vs/workbench/parts/welcome/walkThrough/electron-browser/walkThrough.cont import 'vs/workbench/parts/extensions/electron-browser/extensions.contribution'; import 'vs/workbench/parts/extensions/browser/extensionsQuickOpen'; -import 'vs/workbench/parts/extensions/electron-browser/extensionsViewlet'; // can be packaged separately +import 'vs/workbench/parts/extensions/electron-browser/extensionsViewlet'; import 'vs/workbench/parts/welcome/page/electron-browser/welcomePage.contribution'; import 'vs/workbench/parts/output/electron-browser/output.contribution'; -import 'vs/workbench/parts/output/browser/outputPanel'; // can be packaged separately +import 'vs/workbench/parts/output/browser/outputPanel'; import 'vs/workbench/parts/terminal/electron-browser/terminal.contribution'; import 'vs/workbench/parts/terminal/browser/terminalQuickOpen'; -import 'vs/workbench/parts/terminal/electron-browser/terminalPanel'; // can be packaged separately +import 'vs/workbench/parts/terminal/electron-browser/terminalPanel'; import 'vs/workbench/electron-browser/workbench'; @@ -99,7 +99,6 @@ import 'vs/workbench/parts/tasks/electron-browser/task.contribution'; import 'vs/workbench/parts/emmet/browser/emmet.browser.contribution'; import 'vs/workbench/parts/emmet/electron-browser/emmet.contribution'; -// Code Editor enhacements import 'vs/workbench/parts/codeEditor/codeEditor.contribution'; import 'vs/workbench/parts/execution/electron-browser/execution.contribution'; @@ -138,8 +137,6 @@ import 'vs/workbench/parts/welcome/overlay/browser/welcomeOverlay'; import 'vs/workbench/parts/outline/electron-browser/outline.contribution'; -import 'vs/workbench/parts/navigation/common/navigation.contribution'; - -// services import 'vs/workbench/services/bulkEdit/electron-browser/bulkEditService'; + import 'vs/workbench/parts/experiments/electron-browser/experiments.contribution';