jupyterlab-makefile-file-type-extension 1.0.6__tar.gz → 1.0.67__tar.gz

jupyterlab_makefile_file_type_extension-1.0.67/.claude/JOURNAL.md

@@ -0,0 +1,50 @@
+# Claude Code Journal
+
+This journal tracks substantive work on documents, diagrams, and documentation content.
+
+---
+
+1. **Task - Custom Makefile Syntax Highlighter**: Implemented custom CodeMirror language mode for Makefile syntax highlighting<br>
+    **Result**: Created `src/makefile-mode.ts` with comprehensive token recognition for targets, variable assignments, recipe lines, shell commands, and variable references. Replaced generic CMake mode with Makefile-specific parser that properly handles Make syntax constructs.
+
+2. **Task - Variable Reference Coloring**: Implemented distinct styling for different variable reference types<br>
+    **Result**: Make-style variables `$(VAR)` highlighted with strong emphasis, shell-style variables `${VAR}` highlighted as special, automatic variables `$@`, `$<`, etc. highlighted distinctly. Added recognition for Make functions like `$(shell ...)`, `$(wildcard ...)`, `$(patsubst ...)`.
+
+3. **Task - String Parsing Priority**: Fixed string handling to parse quoted text correctly before other tokens<br>
+    **Result**: Moved string detection to top of token parser flow, ensuring single and double quoted strings are properly recognized and highlighted throughout Makefile content including in variable assignments and recipe commands.
+
+4. **Task - Line Continuation Highlighting**: Added distinct highlighting for backslash line continuations<br>
+    **Result**: Implemented detection of backslash at end of line with `keyword.control escape` styling. Regular backslashes in middle of text remain unstyled, ensuring only true line continuations stand out visually.
+
+5. **Task - Custom File Type Icon**: Designed and implemented pale red settings/gear icon for Makefile files<br>
+    **Result**: Created SVG settings icon with pale red color (#ef9a9a) to represent build/make files. Added pattern field to file type registration to match `Makefile`, `makefile`, `GNUmakefile` filenames. Icon displays in JupyterLab file browser.
+
+6. **Task - Makefile Upgrade Target**: Extended project Makefile with upgrade target for dependency management<br>
+    **Result**: Added `upgrade` target dependent on `check_dependencies` that executes `npm update`, `yarn install`, and `yarn upgrade`. Updated `.PHONY` declarations and bumped Makefile version to 1.25.
+
+7. **Task - Icon Refinement to VS Code Style**: Replaced settings gear icon with bold capital M letter matching VS Code design<br>
+    **Result**: Implemented SVG text-based icon featuring bold (font-weight 900) capital letter "M" in pale red color. Initial color #ef9a9a adjusted to slightly redder #e57373 for better visibility and brand consistency with VS Code Makefile icon style.
+
+8. **Task - Icon Color Optimization**: Fine-tuned M icon color for improved visibility and aesthetic appeal<br>
+    **Result**: Progressively refined icon color from #e57373 to darker and more saturated #d84a4a, achieving better contrast and visual prominence in JupyterLab file browser while maintaining the recognizable red color scheme associated with Makefile icons. Version bumped to 1.0.2 to mark stable release.
+
+9. **Task - String Quote Matching Fix**: Resolved bug where double-quoted strings incorrectly closed on single quotes<br>
+    **Result**: Separated string parsing logic into distinct code blocks for double quotes and single quotes. Each block now explicitly matches only its corresponding closing quote character, preventing cross-quote-type matching. Enhanced color distinction for `$(VAR)` Make-style and `${VAR}` shell-style variable references with comments clarifying the semantic differences.
+
+10. **Task - Shell Command String Handling**: Fixed incorrect string parsing inside `$(shell ...)` and other Make function constructs<br>
+    **Result**: Implemented parenthesis depth tracking with state variable `parenDepth`. When inside `$(...)` constructs (depth > 0), quotes are treated as literal characters with `atom` token type instead of string delimiters. The `$(` and `)` markers receive `processingInstruction` token for visual distinction. Reset depth at start of each line. This prevents strings within shell commands from breaking syntax highlighting while allowing normal parsing for other tokens.
+
+11. **Task - Build Process Improvements and Debugging**: Identified and resolved build caching and version consistency issues<br>
+    **Result**: Discovered TypeScript compilation requires lib directory to exist before `jupyter labextension build` runs. Webpack caching can cause mixed version numbers in logs. Recommended build process: (1) `npm run build:lib:prod` to compile TypeScript to lib/, (2) `jupyter labextension build . --development False` to bundle extension, (3) `pip install -e . --force-reinstall --no-deps` to install Python package. For clean rebuilds, remove lib/ and labextension/ directories first. Added extensive console logging with version numbers to track parser activation and identify MIME type conflicts. Extension supports `.mk`, `.mak`, `.make`, `.makefile` extensions plus filename patterns for `Makefile`, `makefile`, `GNUmakefile`.
+
+12. **Task - .mk File Syntax Highlighting**: Resolved issue where `.mk` files opened in editor but received no syntax highlighting<br>
+    **Result**: Investigated JupyterLab source code to understand file-to-language mapping flow. Discovered two separate pattern registrations required: (1) File type pattern in `app.docRegistry.addFileType()` for icon display and file recognition, (2) Language filename pattern in `languages.addLanguage()` for syntax highlighting. The language registry's `findByFileName()` method checks filename regex BEFORE falling back to extension matching. Root cause was language registration using pattern `^(Makefile|makefile|GNUmakefile|makefile\\..*) which matched standard Makefile names but NOT `*.mk` files. Fixed by updating both patterns to `^(Makefile|makefile|GNUmakefile|makefile\\..*|.*\\.(mk|mak|make|makefile)) ensuring consistent matching across file type and language registries. Confirmed working in v1.0.24 with proper syntax highlighting for all Makefile extensions.
+
+13. **Task - String Parsing Fixes**: Fixed critical bugs in string handling both outside and inside `$(...)` constructs<br>
+    **Result**: First bug - strings OUTSIDE `$(...)` constructs: double-quoted strings were incorrectly closing on single quote characters and vice versa. This occurred in regular Makefile variable assignments and recipe commands. Fixed by separating string parsing logic into completely distinct code blocks for double quotes (lines 169-178) and single quotes (lines 179-188), each explicitly matching only its corresponding closing quote character. Each block has its own `while (!stream.eol())` loop that breaks only on the matching quote. Second bug - strings INSIDE `$(...)` constructs: string parsing logic was executing before `$(...)` construct detection, causing quotes within shell commands to break syntax highlighting. Implemented parenthesis depth tracking using `parenDepth` state variable. Reordered parser checks to detect `$(` pattern BEFORE string handling. Added separate string handling for inside constructs (lines 146-167) where `parenDepth > 0`. Inside constructs, quotes are treated as literal characters with same token type (`property`) as surrounding content instead of string delimiters. The `$(` increments depth, `)` decrements depth, and nested parentheses are tracked correctly. Reset depth at start of each new line. This solution maintains proper string highlighting outside constructs while preventing string parsing from interfering with shell command content. Both blocks handle escape sequences with `if (n === '\\') stream.next()` to skip escaped characters. Fixed in versions leading to v1.0.44 tagged as `SYNTAX_HIGHLIGHT_BASIC_STABLE_v1.0.44`.
+
+14. **Task - Enhanced Makefile Syntax Support**: Implemented comprehensive syntax highlighting for targets, variables, and shell constructs<br>
+    **Result**: Added target recognition with `keyword.control strong` styling for build targets (e.g., `build:`). Implemented `.PHONY` and special target recognition as `builtin`. Changed `$(...)` construct coloring from `processingInstruction` through multiple token types (`meta`, `builtin`, `type`, `namespace`) to final `property` token type for optimal visual distinction. Added support for `$$VARIABLE` environment variables and `$$(...)` shell command substitution with proper depth tracking. Implemented `$$((expression))` arithmetic expansion with special handling for double closing parentheses. Added target dependency highlighting as `processingInstruction` for dependencies listed after colon on target lines. Tagged as STABLE_v1.0.64.
+
+15. **Task - Recipe Command @ Prefix Support**: Added syntax highlighting for silent recipe commands with @ prefix<br>
+    **Result**: Implemented recognition of recipe commands starting with tab followed by `@` prefix (e.g., `	@echo`, `	@mkdir`). Both the `@` symbol and the command name are highlighted together as `builtin` token type, providing visual distinction for silent commands that don't echo during make execution. Commented out all debug console.log statements for production use. Version 1.0.66.

jupyterlab_makefile_file_type_extension-1.0.67/.claude/settings.local.json

@@ -0,0 +1,38 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(npm run build:lib:prod:*)",
+      "Bash(yarn install)",
+      "Bash(git add:*)",
+      "Bash(cat:*)",
+      "Bash(git commit:*)",
+      "Bash(git push)",
+      "Bash(curl:*)",
+      "Bash(git rebase:*)",
+      "Bash(git stash:*)",
+      "Bash(GIT_SEQUENCE_EDITOR=\"sed -i ''1s/^pick/reword/''\" git rebase -i --root)",
+      "Bash(git filter-branch:*)",
+      "Bash(git push:*)",
+      "Bash(git tag:*)",
+      "Bash(jlpm run build:*)",
+      "Bash(pip install:*)",
+      "Bash(jupyter labextension build:*)",
+      "Bash(jupyter lab clean:*)",
+      "Bash(jupyter labextension:*)",
+      "Bash(rm:*)",
+      "Bash(npx tsc:*)",
+      "Bash(mkdir:*)",
+      "Bash(python:*)",
+      "WebFetch(domain:github.com)",
+      "Bash(node test-parser.js:*)",
+      "Bash(node test-tokenize-lines.js:*)",
+      "Bash(tokenization-results.md)",
+      "Bash(git checkout:*)",
+      "Bash(npm version:*)",
+      "Bash(git switch:*)",
+      "Bash(git rm:*)"
+    ],
+    "deny": [],
+    "ask": []
+  }
+}

{jupyterlab_makefile_file_type_extension-1.0.6 → jupyterlab_makefile_file_type_extension-1.0.67}/Makefile

@@ -1,5 +1,5 @@
 # Makefile for Jupyterlab extensions version 1.25
-# author: Stellars Henson <konrad.jelen@gmail.com
+# author: Stellars Henson <konrad.jelen@gmail.com>
 # License: MIT Open Source License
 
 .PHONY: build install clean uninstall publish dependencies mrproper increment_version install_dependencies check_dependencies upgrade help
@@ -22,7 +22,7 @@ increment_version:
 build: clean increment_version check_dependencies
 	npm install
 	yarn install
-	python -m build 
+	python -m build
 
 ## install package
 install: build 

{jupyterlab_makefile_file_type_extension-1.0.6 → jupyterlab_makefile_file_type_extension-1.0.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: jupyterlab_makefile_file_type_extension
-Version: 1.0.6
+Version: 1.0.67
 Summary: Jupyterlab extension to add handling of Makefiles and syntax colouring support
 Project-URL: Homepage, https://github.com/stellarshenson/jupyterlab_makefile_file_type_extension
 Project-URL: Bug Tracker, https://github.com/stellarshenson/jupyterlab_makefile_file_type_extension/issues

{jupyterlab_makefile_file_type_extension-1.0.6 → jupyterlab_makefile_file_type_extension-1.0.67}/jupyterlab_makefile_file_type_extension/_version.py

@@ -1,4 +1,4 @@
 # This file is auto-generated by Hatchling. As such, do not:
 #   - modify
 #   - track in version control e.g. be sure to add to .gitignore
-__version__ = VERSION = '1.0.6'
+__version__ = VERSION = '1.0.67'

{jupyterlab_makefile_file_type_extension-1.0.6 → jupyterlab_makefile_file_type_extension-1.0.67}/jupyterlab_makefile_file_type_extension/labextension/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jupyterlab_makefile_file_type_extension",
-  "version": "1.0.6",
+  "version": "1.0.67",
   "description": "Jupyterlab extension to add handling of Makefiles and syntax colouring support",
   "keywords": [
     "jupyter",
@@ -80,7 +80,7 @@
     "jest": "^29.2.0",
     "npm-run-all2": "^7.0.1",
     "prettier": "^3.0.0",
-    "rimraf": "^5.0.1",
+    "rimraf": "^5.0.10",
     "source-map-loader": "^1.0.2",
     "style-loader": "^3.3.1",
     "stylelint": "^15.10.1",
@@ -103,7 +103,7 @@
     "extension": true,
     "outputDir": "jupyterlab_makefile_file_type_extension/labextension",
     "_build": {
-      "load": "static/remoteEntry.3b34b172c4b557d26b23.js",
+      "load": "static/remoteEntry.27752a82fa0295af2768.js",
       "extension": "./extension",
       "style": "./style"
     }

jupyterlab_makefile_file_type_extension-1.0.67/jupyterlab_makefile_file_type_extension/labextension/static/207.badae462452695117055.js

@@ -0,0 +1 @@
+"use strict";(self.webpackChunkjupyterlab_makefile_file_type_extension=self.webpackChunkjupyterlab_makefile_file_type_extension||[]).push([[207],{207:(e,t,a)=>{a.r(t),a.d(t,{default:()=>r,makefileIcon:()=>o});var n=a(337),i=a(694),l=a(84);const s={name:"makefile",startState:()=>({parenDepth:0,lastLineStart:-1,lastLineText:"",lineTokens:[]}),token:(e,t)=>{const a=e.peek(),n=e.pos,i=e.string||"",l=e.lineStart||0;l!==t.lastLineStart&&(t.parenDepth=0,t.lastLineStart=l,t.lastLineText=i,t.lineTokens=[]);let s=null;if("#"===a)e.skipToEnd(),s="comment";else if(e.sol()&&e.match(/^\t@[a-zA-Z_][a-zA-Z0-9_-]*/,!1))e.match(/^\t/),e.match(/^@/),e.match(/^[a-zA-Z_][a-zA-Z0-9_-]*/),s="builtin";else if(e.sol()&&e.match(/^\.[A-Z_]+/,!1))e.match(/^\.[A-Z_]+/),s="builtin";else if(e.sol()&&e.match(/^[A-Z_][A-Z0-9_]*/,!1))e.match(/^[A-Z_][A-Z0-9_]*/)&&e.match(/\s*[:?+]?=/,!1)?(e.match(/\s*[:?+]?=/),s="variableName.definition strong"):s=null;else if(e.sol()&&e.match(/^[a-zA-Z0-9_\-\.]+:/,!1))s=e.match(/^[a-zA-Z0-9_\-\.]+/)?"keyword.control strong":null;else if(e.sol()||!i.match(/^[a-zA-Z0-9_\-\.]+:/)||"#"===a||e.eol())if(e.match(/[:?+]?=/))s="operator";else if(e.match(/:/))s="operator";else if("$"===a&&e.match(/\$\$\(\(/,!1))e.next(),e.next(),e.next(),e.next(),t.parenDepth+=2,s="property";else if("$"===a&&e.match(/\$\$\(/,!1))e.next(),e.next(),e.next(),t.parenDepth++,s="property";else if("$"===a&&e.match(/\$\(/,!1))e.next(),e.next(),t.parenDepth++,s="property";else if("$"===a&&e.match(/\$\$[a-zA-Z_][a-zA-Z0-9_]*/,!1))e.match(/\$\$[a-zA-Z_][a-zA-Z0-9_]*/),s="property";else if("("===a&&t.parenDepth>0)t.parenDepth++,e.next(),s=null;else if(")"===a&&t.parenDepth>0){const a=e.peek();t.parenDepth--,e.next(),s=0===t.parenDepth||1===t.parenDepth&&")"===a?"property":null}else if(t.parenDepth>0)if('"'===a){for(e.next();!e.eol();){const t=e.next();if('"'===t)break;"\\"===t&&e.next()}s="property"}else if("'"===a){for(e.next();!e.eol();){const t=e.next();if("'"===t)break;"\\"===t&&e.next()}s="property"}else e.next(),s="property";else if('"'===a){for(e.next();!e.eol();){const t=e.next();if('"'===t)break;"\\"===t&&e.next()}s="string"}else if("'"===a){for(e.next();!e.eol();){const t=e.next();if("'"===t)break;"\\"===t&&e.next()}s="string"}else e.next(),s=null;else{const t=i.indexOf(":");t>=0&&n>t?"#"===a?s=null:(e.next(),s="processingInstruction"):(e.next(),s=null)}const o=e.pos,r={start:n,end:o,text:i.slice(n,o),type:s};return t.lineTokens.push(r),e.eol()&&(t.lineTokens=[]),s}},o=new i.LabIcon({name:"makefile:icon",svgstr:'<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">\n  <text x="12" y="18" font-size="20" font-weight="900" text-anchor="middle" fill="#d84a4a" font-family="Arial, sans-serif">M</text>\n</svg>'}),r={id:"jupyterlab_makefile_file_type_extension:plugin",description:"Jupyterlab extension to add handling of Makefiles and syntax colouring support",autoStart:!0,requires:[n.IEditorLanguageRegistry],activate:(e,t)=>{console.log("[jupyterlab_makefile_file_type_extension v1.0.31-debug] Extension activated!"),t.addLanguage({name:"makefile",displayName:"Makefile",mime:"text/x-makefile",extensions:[".mk",".mak",".make",".makefile"],filename:/^(Makefile|makefile|GNUmakefile|makefile\..*|.*\.(mk|mak|make|makefile))$/,support:new l.LanguageSupport(l.StreamLanguage.define(s))}),e.docRegistry.addFileType({name:"makefile",displayName:"Makefile",mimeTypes:["text/x-makefile"],extensions:[".mk",".mak",".make",".makefile"],pattern:"^(Makefile|makefile|GNUmakefile|makefile\\..*|.*\\.(mk|mak|make|makefile))$",fileFormat:"text",contentType:"file",icon:o})}}}}]);

jupyterlab_makefile_file_type_extension-1.0.67/jupyterlab_makefile_file_type_extension/labextension/static/remoteEntry.27752a82fa0295af2768.js

@@ -0,0 +1 @@
+var _JUPYTERLAB;(()=>{"use strict";var e,r,t,n,o,i,a,l,u,f,s,p,d,c,h,v,m,g,b,y={513:(e,r,t)=>{var n={"./index":()=>t.e(207).then(()=>()=>t(207)),"./extension":()=>t.e(207).then(()=>()=>t(207)),"./style":()=>t.e(728).then(()=>()=>t(728))},o=(e,r)=>(t.R=r,r=t.o(n,e)?n[e]():Promise.resolve().then(()=>{throw new Error('Module "'+e+'" does not exist in container.')}),t.R=void 0,r),i=(e,r)=>{if(t.S){var n="default",o=t.S[n];if(o&&o!==e)throw new Error("Container initialization failed as it has already been initialized with a different share scope");return t.S[n]=e,t.I(n,r)}};t.d(r,{get:()=>o,init:()=>i})}},_={};function w(e){var r=_[e];if(void 0!==r)return r.exports;var t=_[e]={id:e,exports:{}};return y[e](t,t.exports,w),t.exports}w.m=y,w.c=_,w.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return w.d(r,{a:r}),r},w.d=(e,r)=>{for(var t in r)w.o(r,t)&&!w.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},w.f={},w.e=e=>Promise.all(Object.keys(w.f).reduce((r,t)=>(w.f[t](e,r),r),[])),w.u=e=>e+"."+{207:"badae462452695117055",728:"1918bf9a0180bf411ce7"}[e]+".js?v="+{207:"badae462452695117055",728:"1918bf9a0180bf411ce7"}[e],w.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),w.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),e={},r="jupyterlab_makefile_file_type_extension:",w.l=(t,n,o,i)=>{if(e[t])e[t].push(n);else{var a,l;if(void 0!==o)for(var u=document.getElementsByTagName("script"),f=0;f<u.length;f++){var s=u[f];if(s.getAttribute("src")==t||s.getAttribute("data-webpack")==r+o){a=s;break}}a||(l=!0,(a=document.createElement("script")).charset="utf-8",w.nc&&a.setAttribute("nonce",w.nc),a.setAttribute("data-webpack",r+o),a.src=t),e[t]=[n];var p=(r,n)=>{a.onerror=a.onload=null,clearTimeout(d);var o=e[t];if(delete e[t],a.parentNode&&a.parentNode.removeChild(a),o&&o.forEach(e=>e(n)),r)return r(n)},d=setTimeout(p.bind(null,void 0,{type:"timeout",target:a}),12e4);a.onerror=p.bind(null,a.onerror),a.onload=p.bind(null,a.onload),l&&document.head.appendChild(a)}},w.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},(()=>{w.S={};var e={},r={};w.I=(t,n)=>{n||(n=[]);var o=r[t];if(o||(o=r[t]={}),!(n.indexOf(o)>=0)){if(n.push(o),e[t])return e[t];w.o(w.S,t)||(w.S[t]={});var i=w.S[t],a="jupyterlab_makefile_file_type_extension",l=[];return"default"===t&&((e,r,t,n)=>{var o=i[e]=i[e]||{},l=o[r];(!l||!l.loaded&&(1!=!l.eager?n:a>l.from))&&(o[r]={get:()=>w.e(207).then(()=>()=>w(207)),from:a,eager:!1})})("jupyterlab_makefile_file_type_extension","1.0.67"),e[t]=l.length?Promise.all(l).then(()=>e[t]=1):1}}})(),(()=>{var e;w.g.importScripts&&(e=w.g.location+"");var r=w.g.document;if(!e&&r&&(r.currentScript&&"SCRIPT"===r.currentScript.tagName.toUpperCase()&&(e=r.currentScript.src),!e)){var t=r.getElementsByTagName("script");if(t.length)for(var n=t.length-1;n>-1&&(!e||!/^http(s?):/.test(e));)e=t[n--].src}if(!e)throw new Error("Automatic publicPath is not supported in this browser");e=e.replace(/^blob:/,"").replace(/#.*$/,"").replace(/\?.*$/,"").replace(/\/[^\/]+$/,"/"),w.p=e})(),t=e=>{var r=e=>e.split(".").map(e=>+e==e?+e:e),t=/^([^-+]+)?(?:-([^+]+))?(?:\+(.+))?$/.exec(e),n=t[1]?r(t[1]):[];return t[2]&&(n.length++,n.push.apply(n,r(t[2]))),t[3]&&(n.push([]),n.push.apply(n,r(t[3]))),n},n=(e,r)=>{e=t(e),r=t(r);for(var n=0;;){if(n>=e.length)return n<r.length&&"u"!=(typeof r[n])[0];var o=e[n],i=(typeof o)[0];if(n>=r.length)return"u"==i;var a=r[n],l=(typeof a)[0];if(i!=l)return"o"==i&&"n"==l||"s"==l||"u"==i;if("o"!=i&&"u"!=i&&o!=a)return o<a;n++}},o=e=>{var r=e[0],t="";if(1===e.length)return"*";if(r+.5){t+=0==r?">=":-1==r?"<":1==r?"^":2==r?"~":r>0?"=":"!=";for(var n=1,i=1;i<e.length;i++)n--,t+="u"==(typeof(l=e[i]))[0]?"-":(n>0?".":"")+(n=2,l);return t}var a=[];for(i=1;i<e.length;i++){var l=e[i];a.push(0===l?"not("+u()+")":1===l?"("+u()+" || "+u()+")":2===l?a.pop()+" "+a.pop():o(l))}return u();function u(){return a.pop().replace(/^\((.+)\)$/,"$1")}},i=(e,r)=>{if(0 in e){r=t(r);var n=e[0],o=n<0;o&&(n=-n-1);for(var a=0,l=1,u=!0;;l++,a++){var f,s,p=l<e.length?(typeof e[l])[0]:"";if(a>=r.length||"o"==(s=(typeof(f=r[a]))[0]))return!u||("u"==p?l>n&&!o:""==p!=o);if("u"==s){if(!u||"u"!=p)return!1}else if(u)if(p==s)if(l<=n){if(f!=e[l])return!1}else{if(o?f>e[l]:f<e[l])return!1;f!=e[l]&&(u=!1)}else if("s"!=p&&"n"!=p){if(o||l<=n)return!1;u=!1,l--}else{if(l<=n||s<p!=o)return!1;u=!1}else"s"!=p&&"n"!=p&&(u=!1,l--)}}var d=[],c=d.pop.bind(d);for(a=1;a<e.length;a++){var h=e[a];d.push(1==h?c()|c():2==h?c()&c():h?i(h,r):!c())}return!!c()},a=(e,r)=>e&&w.o(e,r),l=e=>(e.loaded=1,e.get()),u=e=>Object.keys(e).reduce((r,t)=>(e[t].eager&&(r[t]=e[t]),r),{}),f=(e,r,t)=>{var o=t?u(e[r]):e[r];return Object.keys(o).reduce((e,r)=>!e||!o[e].loaded&&n(e,r)?r:e,0)},s=(e,r,t,n)=>"Unsatisfied version "+t+" from "+(t&&e[r][t].from)+" of shared singleton module "+r+" (required "+o(n)+")",p=e=>{throw new Error(e)},d=e=>{"undefined"!=typeof console&&console.warn&&console.warn(e)},c=(e,r,t)=>t?t():((e,r)=>p("Shared module "+r+" doesn't exist in shared scope "+e))(e,r),h=(e=>function(r,t,n,o,i){var a=w.I(r);return a&&a.then&&!n?a.then(e.bind(e,r,w.S[r],t,!1,o,i)):e(r,w.S[r],t,n,o,i)})((e,r,t,n,o,u)=>{if(!a(r,t))return c(e,t,u);var p=f(r,t,n);return i(o,p)||d(s(r,t,p,o)),l(r[t][p])}),v={},m={84:()=>h("default","@codemirror/language",!1,[1,6,0,0]),337:()=>h("default","@jupyterlab/codemirror",!1,[1,4,4,10]),694:()=>h("default","@jupyterlab/ui-components",!1,[1,4,4,10])},g={207:[84,337,694]},b={},w.f.consumes=(e,r)=>{w.o(g,e)&&g[e].forEach(e=>{if(w.o(v,e))return r.push(v[e]);if(!b[e]){var t=r=>{v[e]=0,w.m[e]=t=>{delete w.c[e],t.exports=r()}};b[e]=!0;var n=r=>{delete v[e],w.m[e]=t=>{throw delete w.c[e],r}};try{var o=m[e]();o.then?r.push(v[e]=o.then(t).catch(n)):t(o)}catch(e){n(e)}}})},(()=>{var e={960:0};w.f.j=(r,t)=>{var n=w.o(e,r)?e[r]:void 0;if(0!==n)if(n)t.push(n[2]);else{var o=new Promise((t,o)=>n=e[r]=[t,o]);t.push(n[2]=o);var i=w.p+w.u(r),a=new Error;w.l(i,t=>{if(w.o(e,r)&&(0!==(n=e[r])&&(e[r]=void 0),n)){var o=t&&("load"===t.type?"missing":t.type),i=t&&t.target&&t.target.src;a.message="Loading chunk "+r+" failed.\n("+o+": "+i+")",a.name="ChunkLoadError",a.type=o,a.request=i,n[1](a)}},"chunk-"+r,r)}};var r=(r,t)=>{var n,o,[i,a,l]=t,u=0;if(i.some(r=>0!==e[r])){for(n in a)w.o(a,n)&&(w.m[n]=a[n]);l&&l(w)}for(r&&r(t);u<i.length;u++)o=i[u],w.o(e,o)&&e[o]&&e[o][0](),e[o]=0},t=self.webpackChunkjupyterlab_makefile_file_type_extension=self.webpackChunkjupyterlab_makefile_file_type_extension||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),w.nc=void 0;var S=w(513);(_JUPYTERLAB=void 0===_JUPYTERLAB?{}:_JUPYTERLAB).jupyterlab_makefile_file_type_extension=S})();

{jupyterlab_makefile_file_type_extension-1.0.6 → jupyterlab_makefile_file_type_extension-1.0.67}/package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "jupyterlab_makefile_file_type_extension",
-    "version": "1.0.6",
+    "version": "1.0.67",
     "lockfileVersion": 3,
     "requires": true,
     "packages": {
         "": {
             "name": "jupyterlab_makefile_file_type_extension",
-            "version": "1.0.6",
+            "version": "1.0.67",
             "license": "BSD-3-Clause",
             "dependencies": {
                 "@codemirror/language": "^6.0.0",
@@ -33,7 +33,7 @@
                 "jest": "^29.2.0",
                 "npm-run-all2": "^7.0.1",
                 "prettier": "^3.0.0",
-                "rimraf": "^5.0.1",
+                "rimraf": "^5.0.10",
                 "source-map-loader": "^1.0.2",
                 "style-loader": "^3.3.1",
                 "stylelint": "^15.10.1",

{jupyterlab_makefile_file_type_extension-1.0.6 → jupyterlab_makefile_file_type_extension-1.0.67}/package.json

@@ -1,6 +1,6 @@
 {
     "name": "jupyterlab_makefile_file_type_extension",
-    "version": "1.0.6",
+    "version": "1.0.67",
     "description": "Jupyterlab extension to add handling of Makefiles and syntax colouring support",
     "keywords": [
         "jupyter",
@@ -80,7 +80,7 @@
         "jest": "^29.2.0",
         "npm-run-all2": "^7.0.1",
         "prettier": "^3.0.0",
-        "rimraf": "^5.0.1",
+        "rimraf": "^5.0.10",
         "source-map-loader": "^1.0.2",
         "style-loader": "^3.3.1",
         "stylelint": "^15.10.1",

{jupyterlab_makefile_file_type_extension-1.0.6 → jupyterlab_makefile_file_type_extension-1.0.67}/src/index.ts

@@ -5,7 +5,7 @@ import {
 import { IEditorLanguageRegistry } from '@jupyterlab/codemirror';
 import { LabIcon } from '@jupyterlab/ui-components';
 import { StreamLanguage, LanguageSupport } from '@codemirror/language';
-import { makefile } from './makefile-mode';
+import { makefileSimple as makefile } from './makefile-mode-simple';
 
 // Import SVG icon as string - bold capital M like VS Code
 const makefileIconStr = `<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
@@ -28,7 +28,7 @@ const plugin: JupyterFrontEndPlugin<void> = {
   requires: [IEditorLanguageRegistry],
   activate: (app: JupyterFrontEnd, languages: IEditorLanguageRegistry) => {
     console.log(
-      'JupyterLab extension jupyterlab_makefile_file_type_extension is activated!'
+      '[jupyterlab_makefile_file_type_extension v1.0.31-debug] Extension activated!'
     );
 
     // Register Makefile language support
@@ -36,24 +36,22 @@ const plugin: JupyterFrontEndPlugin<void> = {
       name: 'makefile',
       displayName: 'Makefile',
       mime: 'text/x-makefile',
-      extensions: ['.mk'],
-      filename: /^(Makefile|makefile|GNUmakefile)$/,
+      extensions: ['.mk', '.mak', '.make', '.makefile'],
+      filename: /^(Makefile|makefile|GNUmakefile|makefile\..*|.*\.(mk|mak|make|makefile))$/,
       support: new LanguageSupport(StreamLanguage.define(makefile))
     });
 
     // Register icon for Makefile file type
-    app.docRegistry.addFileType(
-      {
-        name: 'makefile',
-        displayName: 'Makefile',
-        mimeTypes: ['text/x-makefile'],
-        extensions: ['.mk'],
-        pattern: '^(Makefile|makefile|GNUmakefile)$',
-        fileFormat: 'text',
-        icon: makefileIcon
-      },
-      ['text/x-makefile']
-    );
+    app.docRegistry.addFileType({
+      name: 'makefile',
+      displayName: 'Makefile',
+      mimeTypes: ['text/x-makefile'],
+      extensions: ['.mk', '.mak', '.make', '.makefile'],
+      pattern: '^(Makefile|makefile|GNUmakefile|makefile\\..*|.*\\.(mk|mak|make|makefile))$',
+      fileFormat: 'text' as const,
+      contentType: 'file' as const,
+      icon: makefileIcon
+    });
   }
 };
 

jupyterlab_makefile_file_type_extension-1.0.67/src/makefile-mode-simple.ts

@@ -0,0 +1,227 @@
+import { StreamParser } from '@codemirror/language';
+
+export const makefileSimple: StreamParser<{
+  parenDepth: number;
+  lastLineStart: number;
+  lastLineText: string;
+  lineTokens: Array<{start: number, end: number, text: string, type: string | null}>;
+}> = {
+  name: 'makefile',
+
+  startState: () => ({
+    parenDepth: 0,
+    lastLineStart: -1,
+    lastLineText: '',
+    lineTokens: []
+  }),
+
+  token: (stream, state) => {
+    const ch = stream.peek();
+    const startPos = stream.pos;
+    const lineText = (stream as any).string || '';
+
+    // Reset paren depth only when moving to NEW line
+    const currentLineStart = (stream as any).lineStart || 0;
+    if (currentLineStart !== state.lastLineStart) {
+      state.parenDepth = 0;
+      state.lastLineStart = currentLineStart;
+      state.lastLineText = lineText;
+      state.lineTokens = [];
+    }
+
+    let tokenType: string | null = null;
+
+    // Comments
+    if (ch === '#') {
+      stream.skipToEnd();
+      tokenType = 'comment';
+    }
+    // Recipe commands with @ prefix (e.g., @echo, @mkdir)
+    else if (stream.sol() && stream.match(/^\t@[a-zA-Z_][a-zA-Z0-9_-]*/, false)) {
+      stream.match(/^\t/);  // Consume tab
+      stream.match(/^@/);   // Consume @
+      stream.match(/^[a-zA-Z_][a-zA-Z0-9_-]*/);  // Consume command
+      tokenType = 'builtin';
+    }
+    // Special targets (.PHONY, .DEFAULT_GOAL, etc.) - MUST check before regular targets
+    else if (stream.sol() && stream.match(/^\.[A-Z_]+/, false)) {
+      stream.match(/^\.[A-Z_]+/);
+      tokenType = 'builtin';
+    }
+    // Variable assignments (e.g., TEST := ...) - MUST check before targets
+    else if (stream.sol() && stream.match(/^[A-Z_][A-Z0-9_]*/, false)) {
+      const varName = stream.match(/^[A-Z_][A-Z0-9_]*/);
+      if (varName && stream.match(/\s*[:?+]?=/, false)) {
+        stream.match(/\s*[:?+]?=/);
+        tokenType = 'variableName.definition strong';
+      } else {
+        tokenType = null;
+      }
+    }
+    // Target definitions (e.g., build: dependencies)
+    else if (stream.sol() && stream.match(/^[a-zA-Z0-9_\-\.]+:/, false)) {
+      // Match target name only
+      const targetMatch = stream.match(/^[a-zA-Z0-9_\-\.]+/);
+      if (targetMatch) {
+        tokenType = 'keyword.control strong';
+      } else {
+        tokenType = null;
+      }
+    }
+    // Target dependencies (everything after : on target line until EOL or #)
+    else if (!stream.sol() && lineText.match(/^[a-zA-Z0-9_\-\.]+:/) && ch !== '#' && !stream.eol()) {
+      // Check if we're past the colon on a target line
+      const colonPos = lineText.indexOf(':');
+      if (colonPos >= 0 && startPos > colonPos) {
+        // Consume until end of line or comment
+        if (ch === '#') {
+          // Let comment handler take over
+          tokenType = null;
+        } else {
+          stream.next();
+          tokenType = 'processingInstruction';
+        }
+      } else {
+        stream.next();
+        tokenType = null;
+      }
+    }
+    // Operators
+    else if (stream.match(/[:?+]?=/)) {
+      tokenType = 'operator';
+    }
+    // Colon (for targets)
+    else if (stream.match(/:/)) {
+      tokenType = 'operator';
+    }
+    // Handle $$(( - shell arithmetic expansion (must check before $$()
+    else if (ch === '$' && stream.match(/\$\$\(\(/, false)) {
+      stream.next();
+      stream.next();
+      stream.next();
+      stream.next();
+      state.parenDepth += 2;
+      // console.log(`  [DEPTH] pos=${startPos} $$(( -> depth=${state.parenDepth}`);
+      tokenType = 'property';
+    }
+    // Handle $$( - shell command substitution (must check before $()
+    else if (ch === '$' && stream.match(/\$\$\(/, false)) {
+      stream.next();
+      stream.next();
+      stream.next();
+      state.parenDepth++;
+      // console.log(`  [DEPTH] pos=${startPos} $$( -> depth=${state.parenDepth}`);
+      tokenType = 'property';
+    }
+    // Handle $( - MUST come before string handling
+    else if (ch === '$' && stream.match(/\$\(/, false)) {
+      stream.next();
+      stream.next();
+      state.parenDepth++;
+      // console.log(`  [DEPTH] pos=${startPos} $( -> depth=${state.parenDepth}`);
+      tokenType = 'property';
+    }
+    // Handle $$ variables (e.g., $$HOME, $$PATH, $$cols)
+    else if (ch === '$' && stream.match(/\$\$[a-zA-Z_][a-zA-Z0-9_]*/, false)) {
+      stream.match(/\$\$[a-zA-Z_][a-zA-Z0-9_]*/);
+      tokenType = 'property';
+    }
+    // Track nested ( inside $(...)
+    else if (ch === '(' && state.parenDepth > 0) {
+      state.parenDepth++;
+      stream.next();
+      // console.log(`  [DEPTH] pos=${startPos} ( inside $(...) -> depth=${state.parenDepth}`);
+      tokenType = null;
+    }
+    // Track ) inside $(...)
+    else if (ch === ')' && state.parenDepth > 0) {
+      const nextCh = stream.peek();
+      state.parenDepth--;
+      stream.next();
+      // console.log(`  [DEPTH] pos=${startPos} ) inside $(...) -> depth=${state.parenDepth}`);
+      // Color closing ) as property if: depth reaches 0, OR if next char is also ) and depth is 1
+      tokenType = (state.parenDepth === 0 || (state.parenDepth === 1 && nextCh === ')')) ? 'property' : null;
+    }
+    // Inside $(...) - mark everything as type
+    else if (state.parenDepth > 0) {
+      // Inside $(...)
+      if (ch === '"') {
+        stream.next();
+        while (!stream.eol()) {
+          const n = stream.next();
+          if (n === '"') break;
+          if (n === '\\') stream.next();
+        }
+        tokenType = 'property';
+      } else if (ch === "'") {
+        stream.next();
+        while (!stream.eol()) {
+          const n = stream.next();
+          if (n === "'") break;
+          if (n === '\\') stream.next();
+        }
+        tokenType = 'property';
+      } else {
+        stream.next();
+        tokenType = 'property';
+      }
+    }
+    // Strings - double quote (outside $(...)
+    else if (ch === '"') {
+      stream.next();
+      while (!stream.eol()) {
+        const n = stream.next();
+        if (n === '"') break;
+        if (n === '\\') stream.next();
+      }
+      tokenType = 'string';
+    }
+    // Strings - single quote (outside $(...)
+    else if (ch === "'") {
+      stream.next();
+      while (!stream.eol()) {
+        const n = stream.next();
+        if (n === "'") break;
+        if (n === '\\') stream.next();
+      }
+      tokenType = 'string';
+    }
+    // Default - consume one character
+    else {
+      stream.next();
+      tokenType = null;
+    }
+
+    // Record this token
+    const endPos = stream.pos;
+    const text = lineText.slice(startPos, endPos);
+    const tokenInfo = {
+      start: startPos,
+      end: endPos,
+      text: text,
+      type: tokenType
+    };
+    state.lineTokens.push(tokenInfo);
+
+    // If we reached end of line, flush the summary
+    if (stream.eol()) {
+      // const tokenSummary = state.lineTokens
+      //   .filter(t => t.type !== null)
+      //   .map(t => `[${t.start}-${t.end}] ${(t.type as string).padEnd(22)} ${t.text}`)
+      //   .join('\n  ');
+
+      // console.log(`\n${'='.repeat(80)}`);
+      // console.log(`LINE: ${lineText}`);
+      // console.log(`${'='.repeat(80)}`);
+      // if (tokenSummary) {
+      //   console.log(`  ${tokenSummary}`);
+      // }
+      // console.log(`${'='.repeat(80)}\n`);
+
+      // Clear tokens after logging
+      state.lineTokens = [];
+    }
+
+    return tokenType;
+  }
+};

{jupyterlab_makefile_file_type_extension-1.0.6 → jupyterlab_makefile_file_type_extension-1.0.67}/src/makefile-mode.ts

@@ -2,22 +2,32 @@ import { StreamParser } from '@codemirror/language';
 
 const variableRegex = /\$[\({][A-Za-z0-9_]+[\)}]/;
 const shellVariableRegex = /\$\{[A-Za-z0-9_]+\}/;
-const makeVariableRegex = /\$\([A-Za-z0-9_]+\)/;
 
 export const makefile: StreamParser<{
   inRecipe: boolean;
   inComment: boolean;
+  parenDepth: number;
+  lastLineStart: number;
 }> = {
   name: 'makefile',
 
   startState: () => ({
     inRecipe: false,
-    inComment: false
+    inComment: false,
+    parenDepth: 0,
+    lastLineStart: -1
   }),
 
   token: (stream, state) => {
     const ch = stream.peek();
 
+    // Reset paren depth only when moving to NEW line
+    const currentLineStart = (stream as any).lineStart || 0;
+    if (currentLineStart !== state.lastLineStart) {
+      state.parenDepth = 0;
+      state.lastLineStart = currentLineStart;
+    }
+
     // Line continuation backslash at end of line (must be last char)
     if (ch === '\\') {
       const pos = stream.pos;
@@ -36,19 +46,70 @@ export const makefile: StreamParser<{
       return 'comment';
     }
 
-    // Strings - handle before anything else
-    if (ch === '"' || ch === "'") {
-      const quote = stream.next();
-      while (!stream.eol()) {
-        const next = stream.next();
-        if (next === quote) {
-          break;
+    // Handle $( - MUST come before string handling
+    if (ch === '$' && stream.match(/\$\(/, false)) {
+      stream.next();
+      stream.next();
+      state.parenDepth++;
+
+      // Check for known Make functions
+      if (stream.match(/shell\b|wildcard\b|patsubst\b|filter\b|subst\b|foreach\b/, false)) {
+        stream.match(/\w+/);
+        return 'keyword';
+      }
+
+      return 'processingInstruction';
+    }
+
+    // Track nested ( inside $(...)
+    if (ch === '(' && state.parenDepth > 0) {
+      state.parenDepth++;
+      stream.next();
+      return null;
+    }
+
+    // Track ) inside $(...)
+    if (ch === ')' && state.parenDepth > 0) {
+      state.parenDepth--;
+      stream.next();
+      return state.parenDepth === 0 ? 'processingInstruction' : null;
+    }
+
+    // Strings - double quote
+    if (ch === '"') {
+      const pos = stream.pos;
+      const line = (stream as any).string;
+      console.log(`[STRING] pos=${pos} depth=${state.parenDepth} char="${ch}" line="${line}"`);
+      if (state.parenDepth === 0) {
+        stream.next();
+        while (!stream.eol()) {
+          const n = stream.next();
+          if (n === '"') break;
+          if (n === '\\') stream.next();
         }
-        if (next === '\\') {
-          stream.next();
+        console.log(`[STRING] Parsed as string, consumed to pos=${stream.pos}`);
+        return 'string';
+      } else {
+        stream.next();
+        console.log(`[STRING] Parsed as atom (inside $())`);
+        return 'atom';
+      }
+    }
+
+    // Strings - single quote
+    if (ch === "'") {
+      if (state.parenDepth === 0) {
+        stream.next();
+        while (!stream.eol()) {
+          const n = stream.next();
+          if (n === "'") break;
+          if (n === '\\') stream.next();
         }
+        return 'string';
+      } else {
+        stream.next();
+        return 'atom';
       }
-      return 'string';
     }
 
     // Recipe lines (commands starting with tab)
@@ -109,23 +170,12 @@ export const makefile: StreamParser<{
       return 'keyword.control';
     }
 
-    // Variable references
-    if (ch === '$') {
-      // Make function calls like $(shell ...), $(wildcard ...)
-      if (stream.match(/\$\(shell\b/)) {
-        return 'keyword';
-      }
-      if (stream.match(/\$\(wildcard\b|\$\(patsubst\b|\$\(filter\b|\$\(subst\b|\$\(foreach\b/)) {
-        return 'keyword';
-      }
+    // Variable references - but ONLY if we're not starting a $(...)
+    if (ch === '$' && !stream.match(/\$\(/, false)) {
       // Shell-style variables ${VAR}
       if (stream.match(shellVariableRegex)) {
         return 'variableName.special';
       }
-      // Make-style variables $(VAR)
-      if (stream.match(makeVariableRegex)) {
-        return 'variableName strong';
-      }
       // Automatic variables $@, $<, etc.
       if (stream.match(/\$[@<^+?*%|]/)) {
         return 'variableName.special';