diff --git a/spin2/CHANGELOG.md b/spin2/CHANGELOG.md index 8625804..23b0d9f 100644 --- a/spin2/CHANGELOG.md +++ b/spin2/CHANGELOG.md @@ -20,6 +20,13 @@ Possible next additions: - Add new-file templates as Snippets - Add additional Snippets as the community identifies them +## [0.2.1] 2020-11-25 + +### Minor repairs + +- Spin2: Added "not" operator +- Spin2: Removed escape sequence recognizer so that strings would highlight correctly + ## [0.2.0] 2020-11-07 ### Spin2 and Pasm2 are now complete diff --git a/spin2/launch.json b/spin2/launch.json index b1fbaf5..4d87c46 100644 --- a/spin2/launch.json +++ b/spin2/launch.json @@ -3,7 +3,7 @@ // Hover to view descriptions of existing attributes. // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387 { - "version": "0.2.0", + "version": "0.2.1", "configurations": [ { "name": "Run Extension", diff --git a/spin2/package.json b/spin2/package.json index 51410d7..187691c 100644 --- a/spin2/package.json +++ b/spin2/package.json @@ -3,15 +3,15 @@ "displayName": "Spin2", "description": "Spin2/Pasm2 Syntax Hightlighting and Code Outline support", "icon": "images/Propeller.ico", - "version": "0.2.0", + "version": "0.2.1", "publisher": "IronSheep", "repository": { "type": "git", "url": "https://github.com/ironsheep/P2-vscode-extensions" }, - "bugs": { - "url": "https://github.com/ironsheep/P2-vscode-extensions/issues" - }, + "bugs": { + "url": "https://github.com/ironsheep/P2-vscode-extensions/issues" + }, "author": "IronSheep", "galleryBanner": { "color": "#003060", @@ -22,6 +22,7 @@ "spin", "spin2", "propeller", + "propeller 2", "propeller ii", "parallax" ], @@ -37,18 +38,18 @@ "Programming Languages" ], "contributes": { - "themes": [ - { - "label": "Spin2 Ironsheep", - "uiTheme": "vs-dark", - "path": "./themes/isp-spin-theme.json" - }, - { - "label": "Spin2 Cluso99", - "uiTheme": "hc-black", - "path": "./themes/spin-theme.json" - } - ], + "themes": [ + { + "label": "Spin2 Ironsheep", + "uiTheme": "vs-dark", + "path": "./themes/isp-spin-theme.json" + }, + { + "label": "Spin2 Cluso99", + "uiTheme": "hc-black", + "path": "./themes/spin-theme.json" + } + ], "grammars": [ { "language": "spin2", diff --git a/spin2/syntaxes/spin2.tmLanguage.YAML-tmLanguage b/spin2/syntaxes/spin2.tmLanguage.YAML-tmLanguage index 723c707..6ad79bf 100644 --- a/spin2/syntaxes/spin2.tmLanguage.YAML-tmLanguage +++ b/spin2/syntaxes/spin2.tmLanguage.YAML-tmLanguage @@ -409,7 +409,7 @@ repository: include: '#cog_register_names' - name: keyword.control.flow.spin2 - match: '(?i)\b(IF|ELSEIF|ELSEIFNOT|ELSE|IFNOT|CASE|CASE_FAST|OTHER|REPEAT|FROM|TO|STEP|UNTIL|WHILE|NEXT|QUIT|RETURN|ABORT)\b' + match: '(?i)\b(IF|ELSEIF|ELSEIFNOT|ELSE|IFNOT|NOT|CASE|CASE_FAST|OTHER|REPEAT|FROM|TO|STEP|UNTIL|WHILE|NEXT|QUIT|RETURN|ABORT)\b' - name: keyword.spin.methods.hub.spin2 match: '(?i)\b(COG(CHK|ID|INIT|SPIN|STOP)|(HUB|CLK)SET|LOCK(NEW|RET|TRY|REL|CHK)|(COG|POLL|WAIT)ATN)\b' @@ -540,10 +540,6 @@ repository: name: string.quoted.double.spin2 begin: '"' end: '"' - patterns: - - - name: constant.character.escape.spin2 - match: \\. variable_block: name: meta.block.variable.spin2 begin: '(?i)^(VAR)\b' diff --git a/spin2/syntaxes/spin2.tmLanguage.json b/spin2/syntaxes/spin2.tmLanguage.json index 9acf0ce..3cdbaa3 100644 --- a/spin2/syntaxes/spin2.tmLanguage.json +++ b/spin2/syntaxes/spin2.tmLanguage.json @@ -629,7 +629,7 @@ }, { "name": "keyword.control.flow.spin2", - "match": "(?i)\\b(IF|ELSEIF|ELSEIFNOT|ELSE|IFNOT|CASE|CASE_FAST|OTHER|REPEAT|FROM|TO|STEP|UNTIL|WHILE|NEXT|QUIT|RETURN|ABORT)\\b" + "match": "(?i)\\b(IF|ELSEIF|ELSEIFNOT|ELSE|IFNOT|NOT|CASE|CASE_FAST|OTHER|REPEAT|FROM|TO|STEP|UNTIL|WHILE|NEXT|QUIT|RETURN|ABORT)\\b" }, { "name": "keyword.spin.methods.hub.spin2", @@ -807,13 +807,7 @@ "string": { "name": "string.quoted.double.spin2", "begin": "\"", - "end": "\"", - "patterns": [ - { - "name": "constant.character.escape.spin2", - "match": "\\\\." - } - ] + "end": "\"" }, "variable_block": { "name": "meta.block.variable.spin2",