use indentService, indentUnit for smart indent on non-asm files, last-line indent for asm files

Author: sehugg

src/ide/settings.ts

@@ -3,7 +3,7 @@ import { indentUnit } from "@codemirror/language";
 import { Compartment, EditorState, Extension } from "@codemirror/state";
 import { EditorView, highlightSpecialChars, highlightTrailingWhitespace, highlightWhitespace, keymap } from "@codemirror/view";
 import { debugHighlightTagsTooltip } from "./views/debug";
-import { insertTabKeymap, spacesSpacesKeymap } from "./views/tabs";
+import { insertTabKeymap, smartIndentKeymap } from "./views/tabs";
 
 declare var bootbox;
 declare var $: JQueryStatic;
@@ -31,10 +31,10 @@ const SETTINGS_KEY = "8bitworkshop/editorSettings";
 const defaultSettings: EditorSettings = {
   tabSize: 8,
   tabsToSpaces: true,
-  highlightSpecialChars: true,
-  highlightWhitespace: true,
-  highlightTrailingWhitespace: true,
-  closeBrackets: true,
+  highlightSpecialChars: false,
+  highlightWhitespace: false,
+  highlightTrailingWhitespace: false,
+  closeBrackets: false,
   debugHighlightTags: false,
 };
 
@@ -54,7 +54,7 @@ export function saveSettings(settings: EditorSettings) {
 
 const compartmentValues: [Compartment, (s: EditorSettings) => Extension][] = [
   [tabSizeCompartment, s => [EditorState.tabSize.of(s.tabSize), indentUnit.of(" ".repeat(s.tabSize))]],
-  [tabsToSpacesCompartment, s => keymap.of(s.tabsToSpaces ? spacesSpacesKeymap : insertTabKeymap)],
+  [tabsToSpacesCompartment, s => keymap.of(s.tabsToSpaces ? smartIndentKeymap : insertTabKeymap)],
   [highlightSpecialCharsCompartment, s => s.highlightSpecialChars ? highlightSpecialChars() : []],
   [highlightWhitespaceCompartment, s => s.highlightWhitespace ? highlightWhitespace() : []],
   [highlightTrailingWhitespaceCompartment, s => s.highlightTrailingWhitespace ? highlightTrailingWhitespace() : []],

src/ide/views/editors.ts

@@ -1,7 +1,7 @@
-import { defaultKeymap, history, historyKeymap, isolateHistory, redo, undo } from "@codemirror/commands";
+import { defaultKeymap, history, historyKeymap, indentSelection, isolateHistory, redo, undo } from "@codemirror/commands";
 import { cpp } from "@codemirror/lang-cpp";
 import { markdown } from "@codemirror/lang-markdown";
-import { bracketMatching, foldGutter, indentOnInput } from "@codemirror/language";
+import { bracketMatching, foldGutter, indentOnInput, indentService, indentUnit } from "@codemirror/language";
 import { highlightSelectionMatches, search, searchKeymap } from "@codemirror/search";
 import { EditorState, Extension } from "@codemirror/state";
 import { crosshairCursor, drawSelection, dropCursor, EditorView, highlightActiveLine, highlightActiveLineGutter, keymap, lineNumbers, rectangularSelection, ViewUpdate } from "@codemirror/view";
@@ -43,8 +43,8 @@ const MODEDEFS = {
   inform6: { theme: cobalt },
   markdown: { lineWrap: true },
   fastbasic: { noGutters: true },
-  basic: { noLineNumbers: true, noGutters: true }, // TODO: not used?
-  ecs: { theme: mbo, isAsm: true },
+  basic: { noLineNumbers: true, noGutters: true },
+  ecs: { theme: mbo }, // TODO: is actually mixed-mode, as is verilog
 }
 
 export var textMapFunctions = {
@@ -92,7 +92,7 @@ export class SourceEditor implements ProjectView {
     var isAsm = isAsmOverride || modedef.isAsm;
     var lineWrap = !!modedef.lineWrap;
     var theme = modedef.theme || MODEDEFS.default.theme;
-    var lineNums = !modedef.noLineNumbers && !isMobileDevice;
+    var lineNums = !isAsm && !modedef.noLineNumbers && !isMobileDevice;
     if (qs['embed']) {
       lineNums = false; // no line numbers while embedded
       isAsm = false; // no opcode bytes either
@@ -140,8 +140,26 @@ export class SourceEditor implements ProjectView {
       doc: text,
       extensions: [
 
+        // Non-asm: 2-space indent (placed before settings so it takes precedence over tabSize-based indentUnit)
+        isAsm ? [] : indentUnit.of("  "),
+        // Asm: copy previous line's indentation since asm parsers lack proper indent rules
+        isAsm ? indentService.of((context, pos) => {
+          let lineNum = context.state.doc.lineAt(pos).number;
+          if (lineNum >= 0) {
+            let prevLine = context.state.doc.line(lineNum);
+            if (prevLine.text.trim()) {
+              return context.lineIndent(prevLine.from);
+            }
+          }
+          return 0;
+        }) : [],
+
         // Keybindings from settings must appear before default keymap.
         ...settingsExtensions(loadSettings()),
+        keymap.of([
+          { key: "Ctrl-Shift-i", run: indentSelection },
+          { key: "Cmd-Shift-i", run: indentSelection },
+        ]),
         keymap.of(defaultKeymap),
 
         lineNums ? lineNumbers() : [],

src/ide/views/tabs.ts

@@ -1,94 +1,12 @@
-import { insertTab } from "@codemirror/commands";
-import { countColumn, EditorSelection } from "@codemirror/state";
-import { EditorView, KeyBinding } from "@codemirror/view";
+import { indentLess, indentMore, insertTab } from "@codemirror/commands";
+import { KeyBinding } from "@codemirror/view";
 
-function tab(view: EditorView): boolean {
-  const tabSize = view.state.tabSize;
-  view.dispatch(view.state.changeByRange(sel => {
-    const startLine = view.state.doc.lineAt(sel.from);
-    const endLine = view.state.doc.lineAt(sel.to);
-    if (sel.empty) {
-      // Cursor only: insert spaces to next tab stop
-      const col = sel.head - startLine.from;
-      const spaces = tabSize - (col % tabSize);
-      const insert = " ".repeat(spaces);
-      return {
-        changes: { from: sel.from, insert },
-        range: EditorSelection.cursor(sel.from + spaces),
-      };
-    } else if (startLine.number === endLine.number) {
-      // Single-line selection: replace with spaces, cursor at end of whitespace
-      const col = sel.from - startLine.from;
-      const spaces = tabSize - (col % tabSize);
-      const insert = " ".repeat(spaces);
-      return {
-        changes: { from: sel.from, to: sel.to, insert },
-        range: EditorSelection.cursor(sel.from + spaces),
-      };
-    } else {
-      // Multi-line selection: move first non-ws char to next tab stop on each line
-      const changes = [];
-      for (let i = startLine.number; i <= endLine.number; i++) {
-        const line = view.state.doc.line(i);
-        const firstNonWs = line.text.search(/\S/);
-        if (firstNonWs < 0) continue;
-        const newCol = (Math.floor(firstNonWs / tabSize) + 1) * tabSize;
-        const spaces = newCol - firstNonWs;
-        changes.push({ from: line.from + firstNonWs, insert: " ".repeat(spaces) });
-      }
-      const changeSet = view.state.changes(changes);
-      return {
-        changes: changeSet,
-        range: EditorSelection.range(changeSet.mapPos(sel.from), changeSet.mapPos(sel.to)),
-      };
-    }
-  }));
-  return true;
-}
-
-function shiftTab(view: EditorView): boolean {
-  const tabSize = view.state.tabSize;
-  const changes = [];
-  const seen = new Set<number>();
-  for (const sel of view.state.selection.ranges) {
-    const startLine = view.state.doc.lineAt(sel.from);
-    const endLine = view.state.doc.lineAt(sel.to);
-    for (let i = startLine.number; i <= endLine.number; i++) {
-      if (seen.has(i)) continue;
-      seen.add(i);
-      const line = view.state.doc.line(i);
-      const text = line.text;
-      const firstNonWs = text.search(/\S|$/);
-      if (firstNonWs == -1) continue;
-      const wsVisualCol = countColumn(text, tabSize, firstNonWs);
-      const targetCol = Math.floor((wsVisualCol - 1) / tabSize) * tabSize;
-
-      // Find the character index at targetCol
-      let col = 0;
-      let idx = 0;
-      while (idx < firstNonWs && col < targetCol) {
-        if (text[idx] === '\t') {
-          const nextStop = (Math.floor(col / tabSize) + 1) * tabSize;
-          if (nextStop > targetCol) break;
-          col = nextStop;
-        } else {
-          col++;
-        }
-        idx++;
-      }
-      changes.push({ from: line.from + idx, to: line.from + firstNonWs });
-    }
-  }
-  if (changes.length) view.dispatch({ changes });
-  return true;
-}
-
-export const spacesSpacesKeymap: KeyBinding[] = [
-  { key: "Tab", run: tab },
-  { key: "Shift-Tab", run: shiftTab },
+export const smartIndentKeymap: KeyBinding[] = [
+  { key: "Tab", run: indentMore },
+  { key: "Shift-Tab", run: indentLess },
 ];
 
 export const insertTabKeymap: KeyBinding[] = [
   { key: "Tab", run: insertTab },
-  { key: "Shift-Tab", run: shiftTab },
+  { key: "Shift-Tab", run: indentLess },
 ];

src/parser/lang-basic.ts

@@ -30,6 +30,8 @@ const basicParser: StreamParser<BasicState> = {
 
   indent(state, textAfter, context) {
     const unit = context.unit;
+    // Numbered BASIC lines don't use indentation
+    if (/^\s*\d/.test(textAfter)) return 0;
     const closing = /^(?:next|end|wend|else|to|then)\b/i;
     if (closing.test(textAfter)) {
       return (state.currentIndent - 1) * unit;