jeans/arduino-ide
jeans/arduino-ide
1
0
Fork 0
mirror of https://github.com/arduino/arduino-ide.git synced 2025-06-05 11:46:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arduino-ide-extension/package.json
View File

@ -19,7 +19,6 @@
"@grpc/grpc-js": "^1.1.1",
"@theia/application-package": "next",
"@theia/core": "next",
"@theia/cpp": "next",
"@theia/editor": "next",
"@theia/filesystem": "next",
"@theia/git": "next",
@ -28,6 +27,7 @@
"@theia/monaco": "next",
"@theia/navigator": "next",
"@theia/outline-view": "next",
"@theia/preferences": "next",
"@theia/search-in-workspace": "next",
"@theia/terminal": "next",
"@theia/workspace": "next",

3
arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts
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();

4
arduino-ide-extension/src/browser/theia/core/common-frontend-contribution.ts
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);
}

17
arduino-ide-extension/src/browser/theia/preferences/preference-contribution.ts Normal file
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+,',
});
}
}

1
browser-app/package.json
View File

@ -5,7 +5,6 @@
"license": "MIT",
"dependencies": {
"@theia/core": "next",
"@theia/cpp": "next",
"@theia/debug": "next",
"@theia/editor": "next",
"@theia/file-search": "next",

1
electron-app/package.json
View File

@ -6,7 +6,6 @@
"main": "src-gen/frontend/electron-main.js",
"dependencies": {
"@theia/core": "next",
"@theia/cpp": "next",
"@theia/debug": "next",
"@theia/editor": "next",
"@theia/electron": "next",

21
yarn.lock
View File

@ -2105,23 +2105,6 @@
ws "^7.1.2"
yargs "^11.1.0"
"@theia/cpp@next":
version "1.1.0-next.184f7751"
resolved "https://registry.yarnpkg.com/@theia/cpp/-/cpp-1.1.0-next.184f7751.tgz#96c5ca20d24e1285599d2decfa425d1100f6c8e9"
integrity sha512-TAp0TS5YCUl1z3Avl7BrZF/LrZZmbbR+oMyeOwauVKkoc05k1+fKiH8qVVLeWPkvTmnAKfB/rVxVnmCKLE+O5w==
dependencies:
"@theia/core" next
"@theia/editor" next
"@theia/filesystem" next
"@theia/languages" next
"@theia/monaco" next
"@theia/preferences" next
"@theia/process" next
"@theia/task" next
"@theia/variable-resolver" next
"@theia/workspace" next
string-argv "^0.1.1"
"@theia/debug@1.4.0-next.beb68c7f", "@theia/debug@next":
version "1.4.0-next.beb68c7f"
resolved "https://registry.yarnpkg.com/@theia/debug/-/debug-1.4.0-next.beb68c7f.tgz#c20dd658b207efb5d3534497083f0f3134193f75"
@ -2458,7 +2441,7 @@
"@theia/workspace" "1.4.0-next.beb68c7f"
vscode-ripgrep "^1.2.4"
"@theia/task@1.4.0-next.beb68c7f", "@theia/task@next":
"@theia/task@1.4.0-next.beb68c7f":
version "1.4.0-next.beb68c7f"
resolved "https://registry.yarnpkg.com/@theia/task/-/task-1.4.0-next.beb68c7f.tgz#b0b1022e8b3e69520411d583331bb00f3eaa9d3b"
integrity sha512-hpg3UMeiLrh2LxzJT3mn31E8MuS7OlO5D1VIkahcPOzsHMwqRsxNCJSojpT2coVz4Z11tcdt+0Tz73dfHsSwDw==
@ -2499,7 +2482,7 @@
"@theia/core" "1.4.0-next.beb68c7f"
"@theia/filesystem" "1.4.0-next.beb68c7f"
"@theia/variable-resolver@1.4.0-next.beb68c7f", "@theia/variable-resolver@next":
"@theia/variable-resolver@1.4.0-next.beb68c7f":
version "1.4.0-next.beb68c7f"
resolved "https://registry.yarnpkg.com/@theia/variable-resolver/-/variable-resolver-1.4.0-next.beb68c7f.tgz#f06b2c3a3e2aa731aaa682ef62409c4e6bbb9a94"
integrity sha512-TL0uYHI68Z9kRugygz3wwF+NV+FBsZA+3POxdVV4snWUSoGwmGBWBgb4NZ62Z6W4rRHgLYjs08xl62HtYT1B0Q==