Slightly modify snippets and token detection

Author: TIny-Hacker

CHANGELOG.md

@@ -2,6 +2,19 @@
 
 All notable changes to the "ti-basic" extension will be documented in this file.
 
+## [0.2.6] - 2024-01-06
+
+### Added
+
+- Add support for matricies [A] through [J]
+
+### Changed
+
+- Less strict error checking for tokens to correctly highlight more often, mentioned in [#3](https://github.com/TIny-Hacker/language-ti-basic/issues/3)
+- Check for ` ` and `(` to ensure correct syntax for certain tokens
+- Change logical operation scope to `keyword.operator.expression`, suggested by [nineteendo](https://github.com/nineteendo)
+- Handle snippet arguments slightly differently to consistently highlight them
+
 ## [0.2.1] - 2023-12-11
 
 ### Fixed

package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "ti-basic",
   "displayName": "TI-BASIC",
-  "version": "0.2.1",
+  "version": "0.2.6",
   "description": "Syntax highlighting for z80 TI-BASIC",
   "author": {
     "name": "TIny_Hacker",

package.json

@@ -3,7 +3,7 @@
         "scope": "ti-basic",
         "prefix": ["for", "For"],
         "body": [
-                 "For(${1:variable},${2:start},${3:end},${4:step})",
+                 "For(${1:<variable>},${2:<start>},${3:<end>},${4:<step>})",
                  "$0",
                  "End"
                 ],
@@ -13,7 +13,7 @@
     "if": {
         "scope": "ti-basic",
         "prefix": ["if", "If"],
-        "body": ["If ${1:condition}",
+        "body": ["If ${1:<condition>}",
                  "Then",
                  "$0",
                  "End"            
@@ -24,7 +24,7 @@
     "if-else": {
         "scope": "ti-basic",
         "prefix": ["ife", "IfE"],
-        "body": ["If ${1:condition}",
+        "body": ["If ${1:<condition>}",
                  "Then",
                  "${2:statements}",
                  "Else",
@@ -37,7 +37,7 @@
     "while": {
         "scope": "ti-basic",
         "prefix": ["while", "While"],
-        "body": ["While ${1: condition}",
+        "body": ["While ${1:<condition>}",
                  "$0",
                  "End"
                 ]
@@ -46,11 +46,9 @@
     "repeat":{
         "scope": "ti-basic",
         "prefix": ["repeat", "Repeat"],
-        "body": ["Repeat ${1: condition}",
+        "body": ["Repeat ${1:<condition>}",
                  "$0",
                  "End"
                 ]    
     }
-
-
-}
+}

snippets/tibasic.code-snippets

@@ -2,6 +2,9 @@
 	"$schema": "https://raw.githubusercontent.com/martinring/tmlanguage/master/tmlanguage.json",
 	"name": "8xp",
 	"patterns": [
+		{
+			"include": "#snippets"
+		},
 		{
 			"include": "#control"
 		},
@@ -28,11 +31,15 @@
 		}
 	],
 	"repository": {
+		"snippets": {
+			"name": "variable.other.8xp",
+			"match": "<[a-z ]+>"
+		},
 		"control": {
 			"patterns": [
 				{
 					"name": "keyword.control.8xp",
-					"match": "\\b(If|Then|Else|For|While|Repeat|End|Pause|Lbl|Goto|Wait|IS>|DS<|Menu|Return|Stop|GraphStyle|GraphColor|OpenLib|ExecLib\\b)"
+					"match": "(If |Then|Else|For(?=\\()|While |Repeat |End|Pause|Lbl |Goto |Wait |IS>(?=\\()|DS<(?=\\()|Menu(?=\\()|Return|Stop|GraphStyle(?=\\()|GraphColor(?=\\()|OpenLib(?=\\()|ExecLib )"
 				},
 				{
 					"name": "keyword.control.8xp",
@@ -48,7 +55,7 @@
 				},
 				{
 					"name": "keyword.operator.expression.8xp",
-					"match": "\\b(and|or|not|xor)\\b"
+					"match": "( (and|or|xor) |not(?=\\())"
 				}
 			]
 		},
@@ -60,19 +67,19 @@
 			"patterns": [
 				{
 					"name": "entity.name.function.8xp",
-					"match": "\\bprgm[A-Zθ][0-9A-Zθ]{0,7}\\b"
+					"match": "prgm[A-Zθ][0-9A-Zθ]{0,7}"
 				},
 				{
 					"name": "entity.name.function.8xp",
-					"match": "(?<=[^a-z]|Ans|^)(abs|angle|ANOVA|augment|bal|binom[cp]df|checkTmr|X²([cp]df|\\-Test|GOF\\-Test)|conj|cos(h|)(⁻¹|)|cumSum|dayOfWk|dbd|▶Dec|det|dim|▶DMS|e\\^|\\|E|▶Eff|eval|expr|F[cp]df|▶F◀▶D|Fill|Fix|Float|fMax|fMin|fnInt|[fi]Part|▶Frac|gcd|geomet[cp]df|get(Date|Time)|get(Dt|Tm)(Fmt|Str)|getKey|G\\-T|\\|i|identity|imag|inString|int|ΣInt|inv(Binom|Norm|T)|irr|isClockOn|lcm|length|∆List|ln|log(BASE|)|max|mean|median|Med-Med|min|n[CP]r|n\\/d|nDeriv|▶n/d◀▶Un/d|▶Nom|normal[cp]df|npv|piecewise|poisson[cp]df|▶Polar|ΣPrn|prod|[12]\\-PropZ(Int|Test)|pxl\\-Test|P▶Rx|P▶Ry|rand|randBin|randInt|randIntNoRep|randM|randNorm|re\\^θi|real|▶Rect|ref|remainder|round|\\*row|row\\+|\\*row\\+|rowSwap|rref|R▶P[rθ]|seq|setDate|setDtFmt|setTime|setTmFmt|sin|sin⁻¹|sinh|sinh⁻¹|solve|startTmr|stdDev|su[bm]|Σ|tan|tan⁻¹|tanh|tanh⁻¹|t[cp]df|timeCnv|toString|tvm_FV|tvm_I%|tvm_N|tvm_Pmt|tv_PV|uvAxes|uwAxes|variance|vwAxes|xyLine)\\b"
+					"match": "(abs|angle|ANOVA|augment|bal|binom[cp]df|checkTmr|X²([cp]df|\\-Test|GOF\\-Test)|conj|cos(h|)(⁻¹|)|cumSum|dayOfWk|dbd|▶Dec|det|dim|▶DMS|e\\^|\\|E|▶Eff|eval|expr|F[cp]df|▶F◀▶D|Fill|Fix|Float|fMax|fMin|fnInt|[fi]Part|▶Frac|gcd|geomet[cp]df|get(Date|Time)|get(Dt|Tm)(Fmt|Str)|getKey|G\\-T|\\|i|identity|imag|inString|int|ΣInt|inv(Binom|Norm|T)|irr|isClockOn|lcm|length|∆List|ln|log(BASE|)|max|mean|median|Med-Med|min|n[CP]r|n\\/d|nDeriv|▶n/d◀▶Un/d|▶Nom|normal[cp]df|npv|piecewise|poisson[cp]df|▶Polar|ΣPrn|prod|[12]\\-PropZ(Int|Test)|pxl\\-Test|P▶Rx|P▶Ry|rand|randBin|randInt|randIntNoRep|randM|randNorm|re\\^θi|real|▶Rect|ref|remainder|round|\\*row|row\\+|\\*row\\+|rowSwap|rref|R▶P[rθ]|seq|setDate|setDtFmt|setTime|setTmFmt|sin|sin⁻¹|sinh|sinh⁻¹|solve|startTmr|stdDev|su[bm]|Σ|tan|tan⁻¹|tanh|tanh⁻¹|t[cp]df|timeCnv|toString|tvm_FV|tvm_I%|tvm_N|tvm_Pmt|tv_PV|uvAxes|uwAxes|variance|vwAxes|xyLine)(?=\\()"
 				},
 				{
 					"name": "entity.name.function.8xp",
-					"match": "\\b(Archive|Asm|AsmComp|Asm84CEPrgm|AUTO|AxesOff|AxesOn|a\\+bi|BackgroundOff|BackgroundOn|BorderColor|Boxplot|Circle|CLASSIC|Clear Entries|ClockOff|ClockOn|ClrAllLists|ClrDraw|ClrHome|ClrList|ClrTableCoordOff|CoordOn|CubicReg|DEC|Degree|Depend(Ask|Auto)|DetectAsym(Off|On)|Diagnostic(Off|On)|Disp(Graph|Table|)|Dot\\-(Thick|Thin)|Draw(F|Inv)|Eng|Equ▶String|Exp(Reg|rOff|rOn)|Fn(Off|On)|Full|Func|GarbageCollect|Get|GetCalc|GridDot|GridLine|GridOffHoriz|Horizontal|HistogramIndpnt(Ask|Auto)|Input|Label(Off|On)|Line|(LinReg)(?=\\((a\\+bx|ax\\+b)\\))|((?<=LinReg)\\((a\\+bx|ax\\+b)\\))|LinRegT(Int|Test)|List▶matr|LnReg|Logistic|Manual\\-Fit|MATHPRINT|Matr▶list|ModBoxPlot|Normal|NormProbPlot|Output|Param|Plot[1-3]|Plots(Off|On)|Pmt_(Bgn|End)|Polar|PolarGC|Prompt|Pt\\-(Change|Off|On)|PwrReg|Pxl\\-(Change|Off|On)|(Quad|Quart)Reg|Radian|Real|Recall(GDB|Pic)|RectGC|2\\-SampFTest|2\\-Samp[TZ]Int|2\\-Samp[TZ]Test|Scatter|Sci|Select|Send|Seq|SEQ|Sequential|SetUpEditor|Shade|ShadeX²|ShadeF|ShadeNorm|Shade_t|Simul|SinReg|Sort[AD]|STATWIZARD (OFF|ON)|Store(GDB|Pic)|String▶Equ|Tangent|Text|TextColor|Thick|Thin|Time|TInterval|Trace|T\\-Test|UnArchive|Un\\/d|[12]\\-Var Stats|Vertical|Web|ZBox|ZDecimal|ZFrac1/[2-58]|ZFrac1/10|ZInteger|ZInterval|Zoom In|Zoom Out|ZoomFit|ZoomRcl|ZoomStat|ZoomSto|ZPrevious|ZQuadrant1|ZSquare|ZStandard|Z\\-Test|ZTrig)\\b"
+					"match": "(Archive |Asm(?=\\()|AsmComp(?=\\()|Asm84CEPrgm|AUTO|AxesOff|AxesOn|a\\+bi|BackgroundOff|BackgroundOn|BorderColor|Boxplot|Circle(?=\\()|CLASSIC|Clear Entries|ClockOff|ClockOn|ClrAllLists|ClrDraw|ClrHome|ClrList|ClrTableCoordOff|CoordOn|CubicReg|DEC|Degree|Depend(Ask|Auto)|DetectAsym(Off|On)|Diagnostic(Off|On)|Disp(Graph|Table| )|Dot\\-(Thick|Thin)|Draw(F|Inv)|Eng|Equ▶String(?=\\()|Exp(Reg|rOff|rOn)|Fn(Off|On)|Full|Func|GarbageCollect|Get(Calc)?(?=\\()|GridDot|GridLine|GridOffHoriz|Horizontal |HistogramIndpnt(Ask|Auto)|Input |Label(Off|On)|Line(?=\\()|LinReg(?=\\((a\\+bx|ax\\+b)\\))|(?<=LinReg)\\((a\\+bx|ax\\+b)\\)|LinRegT(Int|Test)|List▶matr(?=\\()|LnReg|Logistic |Manual\\-Fit|MATHPRINT|Matr▶list|ModBoxPlot|Normal|NormProbPlot|Output(?=\\()|Param|Plot[1-3](?=\\()|Plots(Off|On)|Pmt_(Bgn|End)|(►)?Polar|PolarGC|Prompt |Pt\\-(Change|Off|On)(?=\\()|PwrReg |Pxl\\-(Change|Off|On)(?=\\()|(Quad|Quart)Reg |Radian|Real|Recall(GDB|Pic) |RectGC|2\\-SampFTest |2\\-SampT(Int|Test) |2\\-SampZ(Int|Test)(?=\\()|Scatter|Sci|Select(?=\\()|Send(?=\\()|Seq|SEQ\\(n(\\+[12])?\\)|Sequential|SetUpEditor |Shade(X²|F|Norm|_t)?(?=\\()|Simul|SinReg |Sort[AD](?=\\()|STATWIZARD (OFF|ON)|Store(GDB|Pic) |String▶Equ(?=\\()|Tangent(?=\\()|Text(?=\\()|TextColor(?=\\()|Thick|Thin|Time|TInterval |Trace|T\\-Test |UnArchive |Un\\/d|[12]\\-Var Stats |Vertical |Web|ZBox|ZDecimal|ZFrac1/[2-58]|ZFrac1/10|ZInteger|ZInterval|Zoom In|Zoom Out|ZoomFit|ZoomRcl|ZoomStat|ZoomSto|ZPrevious|ZQuadrant1|ZSquare|ZStandard|Z\\-Test(?=\\()|ZTrig)"
 				},
 				{
 					"name": "entity.name.function.8xp",
-					"match": "(?<=(Goto|Lbl) )[0-9A-Zθ]{1,2}\\b"
+					"match": "(?<=(Goto|Lbl) )[0-9A-Zθ]{1,2}"
 				}
 			]
 		},
@@ -89,59 +96,63 @@
 				},
 				{
 					"name": "variable.parameter.8xp",
-					"match": "\\b([A-Zθ]|Xmin|Xmax|Xscl|Ymin|Ymax|YScl|Xres|ΔX|ΔY|XFact|YFact|TraceStep|Tmin|Tmax|Tstep|θmin|θmax|θstep|[uvw]|((?<=[uvw])\\((nMin\\)))|nMin|nMax|PlotStart|PlotStep)\\b"
+					"match": "([A-Zθ]|Xmin|Xmax|Xscl|Ymin|Ymax|YScl|Xres|ΔX|ΔY|XFact|YFact|TraceStep|Tmin|Tmax|Tstep|θmin|θmax|θstep|[uvw]|((?<=[uvw])\\((nMin\\)))|nMin|nMax|PlotStart|PlotStep)"
+				},
+				{
+					"name": "variable.parameter.8xp",
+					"match": "(ZXmin|ZXmax|ZXscl|ZYmin|ZYmax|ZYscl|ZXres|ZTmin|ZTmax|ZTstep|Zθmin|Zθmax|Zθstep|Z[uvw]|((?<=Z[uvw])\\((nMin\\)))|ZnMin|ZnMax|ZPlotStart|ZPlotStep)"
 				},
 				{
 					"name": "variable.parameter.8xp",
-					"match": "\\b(ZXmin|ZXmax|ZXscl|ZYmin|ZYmax|ZYscl|ZXres|ZTmin|ZTmax|ZTstep|Zθmin|Zθmax|Zθstep|Z[uvw]|((?<=Z[uvw])\\((nMin\\)))|ZnMin|ZnMax|ZPlotStart|ZPlotStep)\\b"
+					"match": "GDB[0-9]"
 				},
 				{
 					"name": "variable.parameter.8xp",
-					"match": "\\bGDB[0-9]\\b"
+					"match": "(Pic[0-9]|Image[0-9])"
 				},
 				{
 					"name": "variable.parameter.8xp",
-					"match": "\\b(Pic[0-9]|Image[0-9])\\b"
+					"match": "(n|x̄|Sx|σx|ȳ|Sy|σy|minX|maxX|minY|maxY|Σx|Σx²|Σy|Σy²|Σxy|RegEQ|[a-e]|r|r²|R²|p|z|t|x²|\\|F|df|ṗ|ṗ1|ṗ2|s|x̄1|x̄2|Sx1|Sx2|Sxp|n1|n2|lower|upper|x1|y1|x2|y2|x3|y3|Q1|Med|Q3)"
 				},
 				{
 					"name": "variable.parameter.8xp",
-					"match": "\\b(n|x̄|Sx|σx|ȳ|Sy|σy|minX|maxX|minY|maxY|Σx|Σx²|Σy|Σy²|Σxy|RegEQ|[a-e]|r|r²|R²|p|z|t|x²|\\|F|df|ṗ|ṗ1|ṗ2|s|x̄1|x̄2|Sx1|Sx2|Sxp|n1|n2|lower|upper|x1|y1|x2|y2|x3|y3|Q1|Med|Q3)\\b"
+					"match": "(Tbl(Start|Input)|∆Tbl)"
 				},
 				{
 					"name": "variable.parameter.8xp",
-					"match": "\\b(TblStart|∆Tbl|TblInput)\\b"
+					"match": "Str[0-9]"
 				},
 				{
 					"name": "variable.parameter.8xp",
-					"match": "\\bStr[0-9]\\b"
+					"match": "Y[0-9]"
 				},
 				{
 					"name": "variable.parameter.8xp",
-					"match": "\\bY[0-9]\\b"
+					"match": "[XY][1-6]T"
 				},
 				{
 					"name": "variable.parameter.8xp",
-					"match": "\\b[XY][1-6]T\\b"
+					"match": "r[1-6]"
 				},
 				{
 					"name": "variable.parameter.8xp",
-					"match": "\\br[1-6]\\b"
+					"match": "\\|L[A-Zθ][0-9A-Zθ]{0,4}"
 				},
 				{
 					"name": "variable.parameter.8xp",
-					"match": "\\B\\|L[A-Zθ][0-9A-Zθ]{0,4}\\b"
+					"match": "\\[[A-J]\\]"
 				}
 			]
 		},
 		"constants": {
 			"patterns": [
 				{
 					"name": "constant.language.8xp",
-					"match": "\\b(CENTER|LEFT|RIGHT)\\b"
+					"match": "(CENTER|LEFT|RIGHT)"
 				},
 				{
 					"name": "constant.language.8xp",
-					"match": "\\b(BLUE|RED|BLACK|MAGENTA|GREEN|ORANGE|BROWN|NAVY|LTBLUE|YELLOW|WHITE|LTGRAY|MEDGRAY|GRAY|DARKGRAY)\\b"
+					"match": "(BLUE|RED|BLACK|MAGENTA|GREEN|ORANGE|BROWN|NAVY|LTBLUE|YELLOW|WHITE|LTGRAY|MEDGRAY|GRAY|DARKGRAY)"
 				}
 			]
 		},