couple more P2 fixes

ironsheep · Aug 25, 2023 · da10552 · da10552
1 parent b1b3bfc
commit da10552
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 5 deletions.
diff --git a/spin2/CHANGELOG.md b/spin2/CHANGELOG.md
@@ -18,6 +18,13 @@ Possible next additions:
 - Add new-file templates as Snippets
 - Add additional Snippets as the community identifies them
 
+## [1.9.15] 2023-08-25
+
+General clean up P2 debug support
+
+- P2 Repair Semantic highlight of object referenced names with underscores within debug satements
+- P2 Repair Syntax highlight of strings within in-line pasm
+
 ## [1.9.14] 2023-08-24
 
 General clean up of broken things P1 and P2

diff --git a/spin2/TEST/spin2/220325-fixes.spin2 b/spin2/TEST/spin2/220325-fixes.spin2
@@ -84,7 +84,7 @@ pri rampSlow(tgt_incr, inDrv_incr, inDrv_state) : drv_incr, drv_state_
                 'debug("  rd: + ", sdec_long(drv_incr))
                 cmps    drv_incr, tgt_incr          wc  ' Q: Did we exceed target?
     if_nc       jmp     #.nodebug2
-                debug("  rd: CY!")
+                debug("  rd: CY!")              ' FIXdoneME: string should be colored!
 .nodebug2
 .lastSDnZero
     if_nc        mov     drv_incr, tgt_incr              ' yes, reset to target!

diff --git a/spin2/TEST/spin2/221206-fixes.spin2 b/spin2/TEST/spin2/221206-fixes.spin2
@@ -1,6 +1,6 @@
 ' Run with DEBUG enabled to view
 
-_clkfreq = 300_000_000                                  ' <---  not colored correctly (TOP defaults to CON (but syntax, how???)
+_clkfreq = 300_000_000                                  ' <---  FIXME:l not colored correctly (TOP defaults to CON (but syntax, how???)
 
 sprites = 128
 

diff --git a/spin2/TEST/spin2/FileSystem_16MB.spin2 b/spin2/TEST/spin2/FileSystem_16MB.spin2
@@ -128,7 +128,7 @@ PUB MountFileSystem() | i
     if field[BlockState][i] == sTEMP			'is this a valid block, but not a file block?
       ReadBlock(i, @BlockBuff, $000, $003)		'if so, read first long of block to get ID
       field[IDValid][BlockBuff.long.[19..8]]~		'..cancel ID flag
-      field[BlockState][i] := sFREE   			'..invalidate block status (FIXME: BUG this should NOT see i)
+      field[BlockState][i] := sFREE   			'..invalidate block status (FIXdoneME: BUG this should NOT see i)
       CancelBlock(i)					'..cancel block to inhibit future CRC checks
       FreeBlocks++					'..increment free-block inventory
 

diff --git a/spin2/package.json b/spin2/package.json
@@ -3,7 +3,7 @@
   "displayName": "Spin2",
   "description": "Spin2/Pasm2 Syntax/Semantic Highlighting w/Code Outline and Custom tabbing support",
   "icon": "images/Propeller.ico",
-  "version": "1.9.14",
+  "version": "1.9.15",
   "publisher": "IronSheepProductionsLLC",
   "repository": {
     "type": "git",

diff --git a/spin2/src/spin2.utils.ts b/spin2/src/spin2.utils.ts
@@ -122,7 +122,7 @@ export class ParseUtils {
     //this.logMessage("  -- gdnwlp nonDblStringLine=[" + nonDblStringLine + "]");
     const nonSglStringLine: string = this.removeDebugSingleQuotedStrings(nonDblStringLine, false);
     //this.logMessage("  -- gdnwlp nonSglStringLine=[" + nonSglStringLine + "]");
-    let lineParts: string[] | null = nonSglStringLine.match(/[^ ,@\[\]\=\.\+\-\*\/\:\#\<\>\|\^\&\t\(\)\!\?\~]+/g);
+    let lineParts: string[] | null = nonSglStringLine.match(/[^ ,@\[\]\=\+\-\*\/\:\#\<\>\|\^\&\t\(\)\!\?\~]+/g);
     //let lineParts: string[] | null = line.match(/[^ ,@\[\]\+\-\*\/\<\>\t\(\)]+/g);
     if (lineParts === null) {
       lineParts = [];

diff --git a/spin2/syntaxes/spin2.tmLanguage.YAML-tmLanguage b/spin2/syntaxes/spin2.tmLanguage.YAML-tmLanguage
@@ -291,6 +291,7 @@ repository:
                 name: storage.modifier.spin2
         patterns:
             - include: '#comment'
+            - include: '#string'
             - include: '#constants'
             - include: '#array_index'
             - include: '#number'

diff --git a/spin2/syntaxes/spin2.tmLanguage.json b/spin2/syntaxes/spin2.tmLanguage.json
@@ -523,6 +523,9 @@
         {
           "include": "#comment"
         },
+        {
+          "include": "#string"
+        },
         {
           "include": "#constants"
         },
-Original file line number
+Diff line change
@@ Expand Up / @@ -523,6 +523,9 @@ @@
             {
               "include": "#comment"
             },
+            {
+              "include": "#string"
+            },
             {
               "include": "#constants"
             },
@@ Expand Down @@