Merge Beta feature into Main

index.html

@@ -393,6 +393,7 @@ <h1>Select USB Host Folder</h1>
                 </tr>
             </tbody>
         </table>
+        <div id="firmware-update" class="firmware-update-suggestion-container"></div>
         <h3>More network devices<i class="refresh fa-solid fa-sync-alt" title="Refresh Device List"></i></h3>
         <div id="devices"></div>
         <div class="buttons centered">
@@ -434,6 +435,7 @@ <h3>More network devices<i class="refresh fa-solid fa-sync-alt" title="Refresh D
                 </tr>
             </tbody>
         </table>
+        <div id="firmware-update" class="firmware-update-suggestion-container"></div>
         <div class="buttons centered">
             <button class="purple-button ok-button">Close</button>
         </div>

js/common/circuitpython_highlight.js

@@ -0,0 +1,221 @@
+// CircuitPython syntax highlighting overlay for CodeMirror 6.
+//
+// CodeMirror 6 dropped the simple `extra_keywords` mechanism that CM5 had,
+// so instead of forking @codemirror/lang-python we layer extra decorations
+// on top of the existing Python syntax tree. We walk the tree inside the
+// viewport, find identifier nodes whose text matches a CircuitPython name,
+// and tag them with a CSS class that the theme can style.
+
+import { ViewPlugin, Decoration } from "@codemirror/view";
+import { syntaxTree } from "@codemirror/language";
+import { Prec } from "@codemirror/state";
+
+// Core/built-in CircuitPython modules. These are the identifiers that show
+// up in `import foo` / `from foo import ...` inside CircuitPython code.
+//
+// Sourced from the upstream `shared-bindings/` directory in
+// adafruit/circuitpython, plus port-specific bindings that are widely used
+// (espidf/espnow/espulp on ESP, picodvi/rp2pio on RP2). Standard-Python
+// modules that CircuitPython also exposes (math, os, time, random, struct,
+// hashlib, ipaddress, locale, __future__) are intentionally omitted — they
+// aren't CircuitPython-specific and highlighting them as such would be
+// noisy in regular Python code shown in the editor.
+//
+// Underscore-prefixed internal bindings (_bleio, _eve, _pew, _pixelmap,
+// _stage) are also omitted; users access those via the corresponding
+// `adafruit_*` libraries which are matched by the prefix wildcard below.
+//
+// Third-party Adafruit libraries are matched by the `adafruit_` prefix
+// instead of being listed individually, and community-bundle libraries by
+// the `circuitpython_` prefix, so this set only needs updating when a new
+// shared binding lands upstream.
+const CIRCUITPYTHON_CORE_MODULES = new Set([
+    "aesio",
+    "alarm",
+    "analogbufio",
+    "analogio",
+    "atexit",
+    "audiobusio",
+    "audiocore",
+    "audiodelays",
+    "audiofilters",
+    "audiofreeverb",
+    "audioio",
+    "audiomixer",
+    "audiomp3",
+    "audiopwmio",
+    "audiospeed",
+    "aurora_epaper",
+    "bitbangio",
+    "bitmapfilter",
+    "bitmaptools",
+    "bitops",
+    "board",
+    "busdisplay",
+    "busio",
+    "camera",
+    "canio",
+    "codeop",
+    "countio",
+    "digitalio",
+    "displayio",
+    "dotclockframebuffer",
+    "dualbank",
+    "epaperdisplay",
+    "espidf",
+    "espnow",
+    "espulp",
+    "floppyio",
+    "fontio",
+    "fourwire",
+    "framebufferio",
+    "frequencyio",
+    "getpass",
+    "gifio",
+    "gnss",
+    "i2cdisplaybus",
+    "i2cioexpander",
+    "i2ctarget",
+    "imagecapture",
+    "is31fl3741",
+    "jpegio",
+    "keypad",
+    "keypad_demux",
+    "lvfontio",
+    "max3421e",
+    "mcp4822",
+    "mdns",
+    "memorymap",
+    "memorymonitor",
+    "microcontroller",
+    "mipidsi",
+    "msgpack",
+    "neopixel_write",
+    "nvm",
+    "onewireio",
+    "paralleldisplaybus",
+    "picodvi",
+    "ps2io",
+    "pulseio",
+    "pwmio",
+    "qrio",
+    "qspibus",
+    "rainbowio",
+    "rclcpy",
+    "rgbmatrix",
+    "rotaryio",
+    "rp2pio",
+    "rtc",
+    "sdcardio",
+    "sdioio",
+    "sharpdisplay",
+    "socketpool",
+    "spitarget",
+    "ssl",
+    "storage",
+    "supervisor",
+    "synthio",
+    "terminalio",
+    "tilepalettemapper",
+    "touchio",
+    "traceback",
+    "uheap",
+    "ulab",
+    "usb",
+    "usb_cdc",
+    "usb_hid",
+    "usb_host",
+    "usb_midi",
+    "usb_video",
+    "ustack",
+    "vectorio",
+    "warnings",
+    "watchdog",
+    "wifi",
+    "zlib",
+
+    // Early Adafruit-maintained libraries that predate the `adafruit_`
+    // naming convention and shipped without a prefix. Listed explicitly
+    // because the prefix wildcard below can't catch them.
+    "neopixel",
+    "simpleio",
+]);
+
+// Returns true when `name` is a CircuitPython module worth highlighting.
+// Wildcard-matches anything starting with `adafruit_` (Adafruit-maintained
+// libraries) or `circuitpython_` (community bundle libraries) so new
+// libraries light up automatically without touching this file. Both
+// prefixes are distinctive enough that false positives against ordinary
+// Python code are essentially nil.
+function isCircuitPythonModule(name) {
+    if (CIRCUITPYTHON_CORE_MODULES.has(name)) return true;
+    if (name.startsWith("adafruit_") && name.length > "adafruit_".length) {
+        return true;
+    }
+    if (
+        name.startsWith("circuitpython_") &&
+        name.length > "circuitpython_".length
+    ) {
+        return true;
+    }
+    return false;
+}
+
+const moduleMark = Decoration.mark({ class: "tok-cp-module" });
+
+// Build the decoration set for the part of the document currently visible.
+// Walking only visible ranges keeps this cheap on big files.
+function buildDecorations(view) {
+    const builder = [];
+    for (const { from, to } of view.visibleRanges) {
+        syntaxTree(view.state).iterate({
+            from,
+            to,
+            enter(node) {
+                // We care about identifier-like leaves only. Lezer Python emits
+                // `VariableName` for bare identifiers (including module names
+                // in `import foo` and `from foo import ...`). Module names
+                // accessed as attributes (e.g. `adafruit_io.MQTT`) come in as
+                // `VariableName` for the leftmost part, then `PropertyName`
+                // children — we only mark the root reference.
+                if (node.name !== "VariableName") return;
+                const text = view.state.doc.sliceString(node.from, node.to);
+                if (isCircuitPythonModule(text)) {
+                    builder.push(moduleMark.range(node.from, node.to));
+                }
+            },
+        });
+    }
+    // Decoration ranges must be sorted by `from`, which they already are
+    // because we iterate the tree in document order.
+    return Decoration.set(builder);
+}
+
+// ViewPlugin keeps decorations in sync with viewport / document changes.
+const circuitpythonHighlightPlugin = ViewPlugin.fromClass(
+    class {
+        constructor(view) {
+            this.decorations = buildDecorations(view);
+        }
+        update(update) {
+            if (
+                update.docChanged ||
+                update.viewportChanged ||
+                syntaxTree(update.startState) !== syntaxTree(update.state)
+            ) {
+                this.decorations = buildDecorations(update.view);
+            }
+        }
+    },
+    {
+        decorations: (v) => v.decorations,
+    },
+);
+
+// Wrap the plugin with Prec.highest so its decoration nests inside the
+// classHighlighter span. CodeMirror renders overlapping mark decorations
+// as nested spans where higher-precedence decorations end up closer to
+// the text. The inner span’s `color` is what the user sees, so making
+// `tok-cp-module` the inner class is what lets our pink override the
+// underlying `tok-variableName` blue without resorting to !important.
+export const circuitpythonHighlight = Prec.highest(circuitpythonHighlightPlugin);

js/common/dialogs.js

@@ -1,4 +1,5 @@
 import {sleep, isIp, switchDevice} from './utilities.js';
+import {renderFirmwareSuggestions} from './firmware-check.js';
 import * as focusTrap from 'focus-trap';
 
 const SELECTOR_CLOSE_BUTTON = ".popup-modal__close";
@@ -357,6 +358,10 @@ class DiscoveryModal extends GenericModal {
         this._currentModal.querySelector("#mcuname").textContent = deviceInfo.mcu_name;
         this._currentModal.querySelector("#boardid").textContent = deviceInfo.board_id;
         this._currentModal.querySelector("#uid").textContent = deviceInfo.uid;
+        const updateContainer = this._currentModal.querySelector("#firmware-update");
+        if (updateContainer) {
+            renderFirmwareSuggestions(updateContainer, deviceInfo);
+        }
     }
 
     async _refreshDevices() {
@@ -417,6 +422,10 @@ class DeviceInfoModal extends GenericModal {
         this._currentModal.querySelector("#mcuname").textContent = deviceInfo.mcu_name;
         this._currentModal.querySelector("#boardid").textContent = deviceInfo.board_id;
         this._currentModal.querySelector("#uid").textContent = deviceInfo.uid;
+        const updateContainer = this._currentModal.querySelector("#firmware-update");
+        if (updateContainer) {
+            renderFirmwareSuggestions(updateContainer, deviceInfo);
+        }
     }
 
     async open(workflow, documentState) {