remove now obsolete code

This commit is contained in:
Benjamin Pasero
2018-10-11 12:56:54 +02:00
parent 812b241290
commit db6ebe93f8
4 changed files with 8 additions and 102 deletions
-4
View File
@@ -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"
@@ -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<IWorkbenchContributionsRegistry>(WorkbenchExtensions.Workbench).registerWorkbenchContribution(HistoryNavigationKeybindingsChangedContribution, LifecyclePhase.Eventually);
@@ -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)
}
]);
}
}
}
}
+8 -11
View File
@@ -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';