fix: space strip and tweak settings txt

CHANGELOG.md

@@ -2,6 +2,11 @@
 
 All notable changes to the "nextbasic" extension will be documented in this file.
 
+## [1.5.3] - 2020-09-15
+
+- Fix issues in format document when spaces were being incorrectly striped
+- Add expose the current txt2bas version (useful for debugging)
+
 ## [1.5.2] - 2020-09-10
 
 - Add more detailed error reporting if cspect fails to launch

extension.js

@@ -15,6 +15,7 @@ const runInCspect = require('./lib/auto-run.task');
 const validationDiagnostic = require('./lib/validation.diagnostic');
 const shift = require('./lib/shift.command');
 const renumber = require('./lib/renumber.command');
+const txt2basVersion = require('./lib/txt2bas-version.command');
 
 /**
  * @param {vscode.ExtensionContext} context
@@ -37,6 +38,7 @@ function activate(context) {
   context.subscriptions.push(hoverHelp());
   context.subscriptions.push(runInCspect(context.extensionPath));
   context.subscriptions.push(validationDiagnostic(context));
+  context.subscriptions.push(txt2basVersion());
 }
 
 function deactivate() {}

lib/format-on-type.provider.js

@@ -10,9 +10,7 @@ const format = (module.exports.format = (document, position) => {
     const line = document.lineAt(position.line - 1).text;
     if (line.trim() === '') return;
 
-    const autoline = isAutoLine(document);
-
-    const formatted = formatText(line, autoline);
+    const formatted = formatText(line, true);
     const editor = vscode.window.activeTextEditor;
     return editor.edit((editBuilder) => {
       editBuilder.replace(

lib/txt2bas-version.command.js

@@ -0,0 +1,16 @@
+const vscode = require('vscode');
+const { version } = require('txt2bas');
+
+console.log(version);
+
+module.exports = main;
+
+function main() {
+  return vscode.commands.registerTextEditorCommand(
+    'nextbasic.txt2basVersion',
+    () =>
+      vscode.window.showInformationMessage(
+        'Current txt2bas version: v' + version
+      )
+  );
+}

package.json

@@ -3,7 +3,7 @@
   "displayName": "NextBASIC",
   "description": "NextBASIC",
   "publisher": "remysharp",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "prettier": {
     "singleQuote": true
   },
@@ -45,7 +45,7 @@
         "nextbasic.hdfmonkeyPath": {
           "type": "string",
           "default": "hdfmonkey",
-          "description": "Points the hdfmonkey binary, defaults to searching your $PATH"
+          "description": "Points the full path to the hdfmonkey executable, defaults to searching your $PATH"
         },
         "nextbasic.commentWith": {
           "type": "string",
@@ -115,6 +115,12 @@
         "command": "nextbasic.commentLine",
         "key": "ctrl+/",
         "when": "!isMac && editorLangId == nextbasic"
+      },
+      {
+        "key": "shift+ctrl+r",
+        "mac": "shift+cmd+r",
+        "command": "nextbasic.run",
+        "when": "editorTextFocus && editorLangId == 'nextbasic'"
       }
     ],
     "commands": [
@@ -153,6 +159,10 @@
       {
         "title": "NextBASIC: Comment",
         "command": "nextbasic.commentLine"
+      },
+      {
+        "title": "NextBASIC: txt2bas version",
+        "command": "nextbasic.txt2basVersion"
       }
     ]
   },
@@ -176,7 +186,7 @@
   },
   "dependencies": {
     "lodash.debounce": "^4.0.8",
-    "txt2bas": "^1.14.1"
+    "txt2bas": "^1.14.3"
   },
   "repository": {
     "type": "git",