From 197192e799c0c4cf0358965ac09c3a3902d59c3c Mon Sep 17 00:00:00 2001 From: Stephen M Moraco Date: Tue, 9 Jan 2024 15:24:18 -0700 Subject: [PATCH] fix filename parsing in DAT sections P2 --- spin2/CHANGELOG.md | 6 ++++++ spin2/package.json | 2 +- spin2/scripts/LIVE-package.json | 2 +- spin2/scripts/TEST-package.json | 2 +- spin2/server/src/parser/spin2.utils.ts | 2 +- 5 files changed, 10 insertions(+), 4 deletions(-) diff --git a/spin2/CHANGELOG.md b/spin2/CHANGELOG.md index 288da33..567e136 100644 --- a/spin2/CHANGELOG.md +++ b/spin2/CHANGELOG.md @@ -18,6 +18,12 @@ Possible next additions: - Add new-file templates as Snippets - Add additional Snippets as the community identifies them +## [2.2.13] 2024-01-09 + +Update P2 + +- Fix a broken case of filename parsing (hyphens in filename) + ## [2.2.12] 2024-01-02 Update P1 and P2 diff --git a/spin2/package.json b/spin2/package.json index 57df9bd..c59c015 100644 --- a/spin2/package.json +++ b/spin2/package.json @@ -5,7 +5,7 @@ "icon": "images/Propeller.ico", "author": "IronSheep", "license": "MIT", - "version": "2.2.12", + "version": "2.2.13", "repository": { "type": "git", "url": "https://github.com/ironsheep/P2-vscode-langserv-extension" diff --git a/spin2/scripts/LIVE-package.json b/spin2/scripts/LIVE-package.json index 57df9bd..c59c015 100644 --- a/spin2/scripts/LIVE-package.json +++ b/spin2/scripts/LIVE-package.json @@ -5,7 +5,7 @@ "icon": "images/Propeller.ico", "author": "IronSheep", "license": "MIT", - "version": "2.2.12", + "version": "2.2.13", "repository": { "type": "git", "url": "https://github.com/ironsheep/P2-vscode-langserv-extension" diff --git a/spin2/scripts/TEST-package.json b/spin2/scripts/TEST-package.json index 0e985c4..a215009 100644 --- a/spin2/scripts/TEST-package.json +++ b/spin2/scripts/TEST-package.json @@ -4,7 +4,7 @@ "description": "P1 and P2 Spin/Pasm Syntax/Semantic Highlighting w/Code Outline, Object Outline and Custom tabbing support", "author": "IronSheep", "license": "MIT", - "version": "2.2.12", + "version": "2.2.13", "repository": { "type": "git", "url": "https://github.com/ironsheep/P2-vscode-langserv-extension" diff --git a/spin2/server/src/parser/spin2.utils.ts b/spin2/server/src/parser/spin2.utils.ts index fa9266c..8f57dca 100644 --- a/spin2/server/src/parser/spin2.utils.ts +++ b/spin2/server/src/parser/spin2.utils.ts @@ -701,7 +701,7 @@ export class Spin2ParseUtils { } public getNonWhiteNOperatorLineParts(line: string): string[] { - let lineParts: string[] | null = line.match(/[^ \t\-\+\<\>]+/g); + let lineParts: string[] | null = line.match(/[^ \t\+\<\>]+/g); return lineParts == null ? [] : lineParts; }