8000 Update Theia, CLI and LS by fstasi · Pull Request #610 · arduino/arduino-ide · GitHub
[go: up one dir, main page]
Skip to content

Update Theia, CLI and LS #610

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 14 commits into from
Nov 29, 2021
Merged

Update Theia, CLI and LS #610

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8c4ff30
Update Theia to 1.19.0
fstasi Nov 15, 2021
c3db2e6
update CLI to 0.20.0-rc3
fstasi Nov 23, 2021
723a942
Add language selector to settings
fstasi Nov 18, 2021
77c0ab8
updated language server and vscode-arduino-tools
fstasi Nov 23, 2021
037dbaf
update Language Server flags
fstasi Nov 18, 2021
134ec15
Merge branch 'main' into theia-1.19
fstasi Nov 24, 2021
38989cb
get cli port from config
fstasi Nov 24, 2021
2263d9a
Merge remote-tracking branch 'origin/main' into theia-1.19
fstasi Nov 25, 2021
9bacbde
force native menu on windows
fstasi Nov 25, 2021
5dcfd3c
Merge remote-tracking branch 'origin/main' into theia-1.19
fstasi Nov 25, 2021
a165e64
pinned Language Server to rc2
fstasi Nov 25, 2021
ca78c11
fix search icon
fstasi Nov 29, 2021
caec4e2
update CLI version
fstasi Nov 29, 2021
89a8513
Merge branch 'main' into theia-1.19
fstasi Nov 29, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge remote-tracking branch 'origin/main' into theia-1.19 
# Conflicts:
#	arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts
#	arduino-ide-extension/src/browser/contributions/upload-sketch.ts
  • Loading branch information
@fstasi
fstasi committed Nov 25, 2021
commit 5dcfd3c52f8729e236c9b343b732824163a102fc
5 changes: 5 additions & 0 deletions arduino-ide-extension/src/browser/arduino-ide-frontend-module.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,6 +254,11 @@ import {
UploadCertificateDialogWidget,
} from './dialogs/certificate-uploader/certificate-uploader-dialog';
import { PlotterFrontendContribution } from './serial/plotter/plotter-frontend-contribution';
import {
UserFieldsDialog,
UserFieldsDialogProps,
UserFieldsDialogWidget,
} from './dialogs/user-fields/user-fields-dialog';
import { nls } from '@theia/core/lib/common';

const ElementQueries = require('css-element-queries/src/ElementQueries');
Expand Down
3 changes: 2 additions & 1 deletion arduino-ide-extension/src/browser/contributions/upload-sketch.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@ import {
KeybindingRegistry,
TabBarToolbarRegistry,
} from './contribution';
import { nls } from '@theia/core/lib/common';
import { UserFieldsDialog } from '../dialogs/user-fields/user-fields-dialog';
import { DisposableCollection, nls } from '@theia/core/lib/common';

@injectable()
export class UploadSketch extends SketchContribution {
Expand Down
2 changes: 1 addition & 1 deletion arduino-ide-extension/src/browser/dialogs/user-fields/user-fields-component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import * as React from 'react';
import { BoardUserField } from '../../../common/protocol';
import { nls } from '@theia/core/lib/browser/nls';
import { nls } from '@theia/core/lib/common';

export const UserFieldsComponent = ({
initialBoardUserFields,
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.
0