(#6) repair recognition of X_4P_4DAC1_WFBYTE symbol

ironsheep · Aug 8, 2022 · 7a0f07a · 7a0f07a
1 parent 199e312
commit 7a0f07a
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 10 deletions.
diff --git a/spin2/CHANGELOG.md b/spin2/CHANGELOG.md
@@ -18,15 +18,28 @@ Possible next additions:
 - Add new-file templates as Snippets
 - Add additional Snippets as the community identifies them
 
+## [1.3.9] 2022-08-08
+
+### Minor Highlight fix for unrecognized symbol
+
+- BUGFIX: (#6) correct internal misspelling of X_4P_4DAC1_WFBYTE symbol.
+
+### - Known Issues w/v1.3.9
+
+- Sadly, The single-quote comment now being handled as semantic (vs. syntactic) is causing external VSCode extensions to do brace, parenthesis, and bracket paring to be marked within our trailing line comments. *We have don't have a fix for this yet.*
+- Syntax highlight of DAT section sometimes fails... (although it is less often now...)
+- Semantic highlight: the 'modification' attribute is being over-applied, should use more than := as test!!!!
+- *I'm sure there are more issues...*
+
 ## [1.3.8] 2022-08-08
 
-### Miscellaneous semantic highlight fixes
+### Minor semantic pasm highlight fixes
 
 - BUGFIX (#7) - Fix highlighting in pasm statements when using operators with constants. (added missing detection of =,?,:,!, and ^ pasm operators as defined in pasm language manual)
 
 ### - Known Issues w/v1.3.8
 
-- Sadly, The single-quote comment now being handled as semantic (vs. syntactic) is causing external VSCode extensions to do brace, parenthesis, and bracket paring to be marked within our trailing line comments. *We have don't have a fix for this yet.*
+- The single-quote comment now being handled as semantic (vs. syntactic) is causing external VSCode extensions to do brace, parenthesis, and bracket paring to be marked within our trailing line comments. *We have don't have a fix for this yet.*
 - Syntax highlight of DAT section sometimes fails... (although it is less often now...)
 - Semantic highlight: the 'modification' attribute is being over-applied, should use more than := as test!!!!
 - *I'm sure there are more issues...*

diff --git a/spin2/TEST/test-file-004.spin2 b/spin2/TEST/test-file-004.spin2
@@ -436,7 +436,7 @@ PUB symbolsThatAre()
         X_4ADC8_0P_4DAC8_WFLONG
         X_4P_1DAC4_WFBYTE
         X_4P_2DAC2_WFBYTE
-        X_4P_4DAC1_WF_BYTE
+        X_4P_4DAC1_WFBYTE
         X_8P_1DAC8_WFBYTE
         X_8P_2DAC4_WFBYTE
         X_8P_4DAC2_WFBYTE

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 support",
     "icon": "images/Propeller.ico",
-    "version": "1.3.8",
+    "version": "1.3.9",
     "publisher": "IronSheepProductionsLLC",
     "repository": {
         "type": "git",
@@ -160,6 +160,5 @@
         "vscode-test": "^1.5.2",
         "vsce": "^1.85.0"
     },
-    "dependencies": {
-    }
-}
+    "dependencies": {}
+}
diff --git a/spin2/src/spin2.extension.ts b/spin2/src/spin2.extension.ts
@@ -3905,7 +3905,7 @@ class Spin2DocumentSemanticTokensProvider implements vscode.DocumentSemanticToke
             'x_16p_2dac8_wfword', 'x_16p_4dac4_wfword', 'x_1adc8_0p_1dac8_wfbyte', 'x_1adc8_8p_2dac8_wfword',
             'x_1p_1dac1_wfbyte', 'x_2adc8_0p_2dac8_wfword', 'x_2adc8_16p_4dac8_wflong', 'x_2p_1dac2_wfbyte',
             'x_2p_2dac1_wfbyte', 'x_32p_4dac8_wflong', 'x_4adc8_0p_4dac8_wflong', 'x_4p_1dac4_wfbyte',
-            'x_4p_2dac2_wfbyte', 'x_4p_4dac1_wf_byte', 'x_8p_1dac8_wfbyte', 'x_8p_2dac4_wfbyte',
+            'x_4p_2dac2_wfbyte', 'x_4p_4dac1_wfbyte', 'x_8p_1dac8_wfbyte', 'x_8p_2dac4_wfbyte',
             'x_8p_4dac2_wfbyte', 'x_alt_off', 'x_alt_on', 'x_dacs_0n0_0n0', 'x_dacs_0n0_x_x', 'x_dacs_0_0_0_0',
             'x_dacs_0_0_x_x', 'x_dacs_0_x_x_x', 'x_dacs_1n1_0n0', 'x_dacs_1_0_1_0', 'x_dacs_1_0_x_x',
             'x_dacs_3_2_1_0', 'x_dacs_off', 'x_dacs_x_0_x_x', 'x_dacs_x_x_0n0', 'x_dacs_x_x_0_0',

diff --git a/spin2/syntaxes/spin2.tmLanguage.YAML-tmLanguage b/spin2/syntaxes/spin2.tmLanguage.YAML-tmLanguage
@@ -509,7 +509,7 @@ repository:
                 match: '(?i)\b(X_2ADC8_16P_4DAC8_WFLONG|X_2P_1DAC2_WFBYTE|X_2P_2DAC1_WFBYTE|X_32P_4DAC8_WFLONG|X_4ADC8_0P_4DAC8_WFLONG|X_4P_1DAC4_WFBYTE)\b'
             -
                 name: constant.language.streamer.spin2
-                match: '(?i)\b(X_4P_2DAC2_WFBYTE|X_4P_4DAC1_WF_BYTE|X_8P_1DAC8_WFBYTE|X_8P_2DAC4_WFBYTE|X_8P_4DAC2_WFBYTE|X_DACS_0N0_0N0|X_DACS_0N0_X_X)\b'
+                match: '(?i)\b(X_4P_2DAC2_WFBYTE|X_4P_4DAC1_WFBYTE|X_8P_1DAC8_WFBYTE|X_8P_2DAC4_WFBYTE|X_8P_4DAC2_WFBYTE|X_DACS_0N0_0N0|X_DACS_0N0_X_X)\b'
             -
                 name: constant.language.streamer.spin2
                 match: '(?i)\b(X_DACS_0_0_0_0|X_DACS_0_0_X_X|X_DACS_0_X_X_X|X_DACS_1N1_0N0|X_DACS_1_0_1_0|X_DACS_1_0_X_X|X_DACS_3_2_1_0|X_DACS_OFF|X_DACS_X_0_X_X)\b'

diff --git a/spin2/syntaxes/spin2.tmLanguage.json b/spin2/syntaxes/spin2.tmLanguage.json
@@ -746,7 +746,7 @@
         },
         {
           "name": "constant.language.streamer.spin2",
-          "match": "(?i)\\b(X_4P_2DAC2_WFBYTE|X_4P_4DAC1_WF_BYTE|X_8P_1DAC8_WFBYTE|X_8P_2DAC4_WFBYTE|X_8P_4DAC2_WFBYTE|X_DACS_0N0_0N0|X_DACS_0N0_X_X)\\b"
+          "match": "(?i)\\b(X_4P_2DAC2_WFBYTE|X_4P_4DAC1_WFBYTE|X_8P_1DAC8_WFBYTE|X_8P_2DAC4_WFBYTE|X_8P_4DAC2_WFBYTE|X_DACS_0N0_0N0|X_DACS_0N0_X_X)\\b"
         },
         {
           "name": "constant.language.streamer.spin2",