Pulled in @theia/preferences, removed @theia/cpp

Signed-off-by: Akos Kitta <kittaakos@typefox.io>
This commit is contained in:
Akos Kitta
2020-07-20 14:24:17 +02:00
parent 23450ce863
commit 537291b494
7 changed files with 26 additions and 23 deletions

View File

@@ -98,6 +98,8 @@ import { UploadSketch } from './contributions/upload-sketch';
import { CommonFrontendContribution } from './theia/core/common-frontend-contribution';
import { EditContributions } from './contributions/edit-contributions';
import { OpenSketchExternal } from './contributions/open-sketch-external';
import { PreferencesContribution as TheiaPreferencesContribution } from '@theia/preferences/lib/browser/preference-contribution';
import { PreferencesContribution } from './theia/preferences/preference-contribution';
const ElementQueries = require('css-element-queries/src/ElementQueries');
@@ -272,6 +274,7 @@ export default new ContainerModule((bind: interfaces.Bind, unbind: interfaces.Un
rebind(TheiaWorkspaceFrontendContribution).to(WorkspaceFrontendContribution).inSingletonScope();
rebind(TheiaFileMenuContribution).to(ArduinoFileMenuContribution).inSingletonScope();
rebind(TheiaCommonFrontendContribution).to(CommonFrontendContribution).inSingletonScope();
rebind(TheiaPreferencesContribution).to(PreferencesContribution).inSingletonScope();
// Show a disconnected status bar, when the daemon is not available
bind(ApplicationConnectionStatusContribution).toSelf().inSingletonScope();

View File

@@ -16,7 +16,9 @@ export class CommonFrontendContribution extends TheiaCommonFrontendContribution
CommonCommands.COPY_PATH,
CommonCommands.FIND,
CommonCommands.REPLACE,
CommonCommands.AUTO_SAVE
CommonCommands.AUTO_SAVE,
CommonCommands.SELECT_ICON_THEME,
CommonCommands.SELECT_COLOR_THEME
]) {
registry.unregisterMenuAction(command);
}

View File

@@ -0,0 +1,17 @@
import { injectable } from 'inversify';
import { KeybindingRegistry } from '@theia/core/lib/browser/keybinding';
import { PreferencesContribution as TheiaPreferencesContribution } from '@theia/preferences/lib/browser/preference-contribution';
import { CommonCommands } from '@theia/core/lib/browser';
@injectable()
export class PreferencesContribution extends TheiaPreferencesContribution {
registerKeybindings(registry: KeybindingRegistry): void {
// https://github.com/eclipse-theia/theia/issues/8202
registry.registerKeybinding({
command: CommonCommands.OPEN_PREFERENCES.id,
keybinding: 'CtrlCmd+,',
});
}
}