Merge branch 'release/v1.1.0'

CHANGELOG.md

@@ -1,5 +1,14 @@
 # Release Notes
 
+## 1.1.0 (2018-08-31)
+
+* New "Debug" group to "Quick Access" view
+  - "Start Debugging", will start debug session, activate debug console and focus "Debug" View
+  - "Toggle Debug Console", an optional button to show active debug console
+* Improved support for Arduino files with `*.ino` extension
+* Focus "Explorer" view when adding new project folder to workspace
+* Do not shutdown PIO Home server when folder is added to workspace
+
 ## 1.0.0 (2018-08-30)
 
 * [Multi-root Workspaces](https://code.visualstudio.com/docs/editor/multi-root-workspaces), work on several related projects at one time (issue [#50](https://github.com/platformio/platformio-vscode-ide/issues/50))

package.json

@@ -1,6 +1,6 @@
 {
   "name": "platformio-ide",
-  "version": "1.0.0",
+  "version": "1.1.0",
   "publisher": "platformio",
   "engines": {
     "vscode": "^1.24.0"
@@ -15,10 +15,10 @@
   ],
   "keywords": [
     "IoT",
+    "c",
+    "c++",
     "embedded",
-    "firmware",
-    "debug",
-    "microcontroller"
+    "arduino"
   ],
   "main": "./lib/main",
   "icon": "resources/platformio-logo.png",
@@ -70,6 +70,15 @@
           ".s"
         ],
         "configuration": "./syntaxes/assembly-configuration.json"
+      },
+      {
+        "id": "cpp",
+        "extensions": [
+          ".ino"
+        ],
+        "aliases": [
+          "Arduino"
+        ]
       }
     ],
     "grammars": [
@@ -87,6 +96,11 @@
         "language": "platformio-debug.asm",
         "scopeName": "source.platformio-debug-asm",
         "path": "./syntaxes/assembly.tmLanguage"
+      },
+      {
+        "language": "cpp",
+        "path": "./syntaxes/arduino.tmLanguage",
+        "scopeName": "source.cpp.arduino"
       }
     ],
     "commands": [
@@ -135,6 +149,11 @@
         "title": "New Terminal",
         "category": "PlatformIO"
       },
+      {
+        "command": "platformio-ide.startDebugging",
+        "title": "Start Debugging",
+        "category": "PlatformIO"
+      },
       {
         "command": "platformio-ide.updateGlobalLibs",
         "title": "Update global libraries",

src/home.js

@@ -75,6 +75,7 @@ export default class PIOHome {
           } else {
             vscode.commands.executeCommand('vscode.openFolder', vscode.Uri.file(params));
           }
+          vscode.commands.executeCommand('workbench.view.explorer');
         }
       }
     });

src/main.js

@@ -36,10 +36,16 @@ class PlatformIOVSCodeExtension {
 
   activate(context) {
     this.context = context;
+    this.pioHome = new PIOHome();
+    this.pioTerm = new PIOTerminal();
+
     this.context.subscriptions.push(
+      this.pioHome,
+      this.pioTerm,
       vscode.workspace.onDidChangeWorkspaceFolders(this.reinit.bind(this)),
       vscode.workspace.onDidChangeConfiguration(() => this.reinit(true))
     );
+
     this.reinit();
   }
 
@@ -53,10 +59,6 @@ class PlatformIOVSCodeExtension {
       return;
     }
 
-    this.pioHome = new PIOHome();
-    this.pioTerm = new PIOTerminal();
-    this.subscriptions.push(this.pioHome, this.pioTerm);
-
     if (!this._initedBefore) {
       pioNodeHelpers.misc.patchOSEnviron({
         caller: 'vscode',
@@ -203,6 +205,14 @@ class PlatformIOVSCodeExtension {
         'platformio-ide.newTerminal',
         () => this.pioTerm.new().show()
       ),
+      vscode.commands.registerCommand(
+        'platformio-ide.startDebugging',
+        () => {
+          vscode.commands.executeCommand('workbench.view.debug');
+          vscode.commands.executeCommand('workbench.debug.action.toggleRepl');
+          vscode.commands.executeCommand('workbench.action.debug.start');
+        }
+      ),
       vscode.commands.registerCommand(
         'platformio-ide.updateGlobalLibs',
         () => this.pioTerm.sendText('platformio lib --global update')

src/views/quick-access-tree.js

@@ -31,6 +31,10 @@ export default class QuickAccessTreeProvider {
       new QuickItem('PIO Home', 'platformio-ide.showHome'),
       new QuickItem('New Terminal', 'platformio-ide.newTerminal'),
       new QuickItem('Clone Git Project', 'git.clone'),
+      new QuickItem('Debug', undefined, vscode.TreeItemCollapsibleState.Expanded, [
+        new QuickItem('Start Debugging', 'platformio-ide.startDebugging'),
+        new QuickItem('Toggle Debug Console', 'workbench.debug.action.toggleRepl')
+      ]),
       new QuickItem('Updates', undefined, vscode.TreeItemCollapsibleState.Expanded, [
         new QuickItem('Update global libraries', 'platformio-ide.updateGlobalLibs'),
         new QuickItem('Update platforms & packages', 'platformio-ide.updatePlatforms'),

syntaxes/arduino.tmLanguage

@@ -0,0 +1,67 @@
+<!--
+language grammars reference document: https://manual.macromates.com/en/language_grammars
+Arduino Language reference document: https://www.arduino.cc/en/Reference/HomePage
+-->
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+	<dict>
+		<key>scopeName</key>
+		<string>source.cpp.arduino</string>
+		<key>uuid</key>
+		<string>65E5AFAE-4AE7-4DAE-837B-1B99810E464D</string>
+		<key>fileTypes</key>
+		<array>
+			<string>ino</string>
+		</array>
+		<key>foldingStartMarker</key>
+		<string>/\*\*|\{\s*$</string>
+		<key>foldingStopMarker</key>
+		<string>\*\*/|^\s*\}</string>
+		<key>name</key>
+		<string>Arduino</string>
+		<key>patterns</key>
+		<array>
+			<dict>
+				<key>match</key>
+				<string>\b(HIGH|LOW|INPUT|OUTPUT|INPUT_PULLUP|LED_BUILTIN|DEC|BIN|HEX|OCT|BYTE|PI|HALF_PI|TWO_PI|LSBFIRST|MSBFIRST|CHANGE|FALLING|RISING|DEFAULT|EXTERNAL|INTERNAL|INTERNAL1V1|INTERNAL2V56|null)\b</string>
+				<key>name</key>
+				<string>storage.type.cpp.arduino</string>
+			</dict>
+			<dict>
+				<key>match</key>
+				<string>\b(boolean|byte|word|string|String|array)\b</string>
+				<key>name</key>
+				<string>storage.cpp.arduino</string>
+			</dict>
+			<dict>
+				<key>match</key>
+				<string>\b(abs|acos|asin|atan|atan2|ceil|constrain|cos|degrees|exp|floor|log|map|max|min|radians|random|randomSeed|round|sin|sq|sqrt|tan|bitRead|bitWrite|bitSet|bitClear|bit|highByte|lowByte|analogReference|analogRead|analogWrite|analogReadResolution|analogWriteResolution|attachInterrupt|detachInterrupt|delay|delayMicroseconds|digitalWrite|digitalRead|interrupts|millis|micros|noInterrupts|noTone|pinMode|pulseIn|shiftIn|shiftOut|tone|begin|end|read|print|println|available|flush)\b</string>
+				<key>name</key>
+				<string>support.function.cpp.arduino</string>
+			</dict>
+			<dict>
+				<key>match</key>
+				<string>\b\s*(setup|loop)\b</string>
+				<key>name</key>
+				<string>keyword.control.cpp.arduino</string>
+			</dict>
+			<dict>
+				<key>match</key>
+				<string>\b(Serial\d?|Stream|Keyboard|Mouse)\b</string>
+				<key>name</key>
+				<string>support.class.cpp.arduino</string>
+			</dict>
+			<dict>
+				<key>match</key>
+				<string>\b(private|protected|public)</string>
+				<key>name</key>
+				<string>storage.modifier.cpp.arduino</string>
+			</dict>
+			<dict>
+				<key>include</key>
+				<string>source.cpp</string>
+			</dict>
+		</array>
+	</dict>
+</plist>