Skip to content

Commit f26dae1

Browse files
Akos Kittakittaakos
Akos Kitta
authored andcommitted
ATL-222: Moved the language feature to a VS Code extension.
Updated to next Theia: 1.6.0-next.b43a1623. Signed-off-by: Akos Kitta <[email protected]>
1 parent fbebfc7 commit f26dae1

30 files changed

+1382
-3589
lines changed

.github/workflows/build.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ jobs:
3232
- name: Checkout
3333
uses: actions/checkout@v2
3434

35-
- name: Install Node.js 10.x
35+
- name: Install Node.js 12.x
3636
uses: actions/setup-node@v1
3737
with:
38-
node-version: '10.x'
38+
node-version: '12.14.1'
3939
registry-url: 'https://registry.npmjs.org'
4040

4141
- name: Install Python 2.7

.vscode/tasks.json

+11
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,17 @@
33
// for the documentation about the tasks.json format
44
"version": "2.0.0",
55
"tasks": [
6+
{
7+
"label": "Arduino Pro IDE - Rebuild Electron App",
8+
"type": "shell",
9+
"command": "yarn rebuild:browser && yarn rebuild:electron",
10+
"group": "build",
11+
"presentation": {
12+
"reveal": "always",
13+
"panel": "new",
14+
"clear": false
15+
}
16+
},
617
{
718
"label": "Arduino Pro IDE - Start Browser App",
819
"type": "shell",

arduino-debugger-extension/src/browser/arduino-debug-frontend-application-contribution.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { injectable, inject } from 'inversify';
2-
import { MenuModelRegistry, Path, MessageService, Command, CommandRegistry } from '@theia/core';
2+
import { MenuModelRegistry, MessageService, Command, CommandRegistry } from '@theia/core';
33
import { KeybindingRegistry } from '@theia/core/lib/browser';
44
import { TabBarToolbarRegistry } from '@theia/core/lib/browser/shell/tab-bar-toolbar';
55
import { DebugFrontendApplicationContribution, DebugCommands } from '@theia/debug/lib/browser/debug-frontend-application-contribution';
@@ -62,8 +62,8 @@ export class ArduinoDebugFrontendApplicationContribution extends DebugFrontendAp
6262
if (current.configuration.type === 'arduino') {
6363
const wsStat = this.workspaceService.workspace;
6464
let sketchFileURI: URI | undefined;
65-
if (wsStat && await this.sketchesService.isSketchFolder(wsStat.uri)) {
66-
const wsPath = new Path(wsStat.uri);
65+
if (wsStat && await this.sketchesService.isSketchFolder(wsStat.resource.toString())) {
66+
const wsPath = wsStat.resource.path;
6767
const sketchFilePath = wsPath.join(wsPath.name + '.ino').toString();
6868
sketchFileURI = new URI(sketchFilePath);
6969
} else if (this.editorManager.currentEditor) {

arduino-debugger-extension/src/node/debug-adapter/arduino-gdb-backend.ts

+1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ export class ArduinoGDBBackend extends GDBBackend {
3030
'--interpreter', 'mi2',
3131
sketchDir
3232
];
33+
console.log('Starting debugger:', command, JSON.stringify(args));
3334
const proc = spawn(command, args);
3435
this.proc = proc;
3536
this.out = proc.stdin;

0 commit comments

Comments
 (0)