Regression fixed: issue #30 and what's new command.

maziac · Jan 10, 2021 · 889298b · 889298b
1 parent 03ff2f0
commit 889298b
Show file tree

Hide file tree

Showing 7 changed files with 14 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+# 1.6.2
+- Regression fixed: Issue #30: Goto definition to local label not working
+- Regression fixed: what's new command.
+
 # 1.6.1
 - Fixed: missing manifest.
 
@@ -9,6 +13,7 @@
 # 1.5.9
 - Added syntax highlighting for SLDOPT sjasmplus keyword thanks to kborowinski.
 - Fixed sjasmplus OUTEND highlighting thanks to kborowinski.
+
 # 1.5.8
 - Fixed #46: Syntax highlighting: clash of Z80 vs. x86
 - Added syntax highlighting for DeZog WPMEM, LOGPOINT and ASSERTION.

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
     "name": "asm-code-lens",
     "displayName": "ASM Code Lens",
-    "version": "1.6.1",
+    "version": "1.6.2",
     "publisher": "maziac",
     "description": "A language server that enables code lens, references, hover information, symbol renaming and the outline view for assembler files.",
     "author": {

diff --git a/releases/asm-code-lens-1.6.2.vsix b/releases/asm-code-lens-1.6.2.vsix
diff --git a/src/extension.ts b/src/extension.ts
@@ -23,6 +23,9 @@ export function activate(context: vscode.ExtensionContext) {
         // Major or minor version changed so show the whatsnew page.
         new WhatsNewView();
     }
+    // Register the additional command to view the "Whats' New" page.
+    context.subscriptions.push(vscode.commands.registerCommand("asm-code-lens.whatsNew", () => new WhatsNewView()));
+
 
     // Register the hex calculator webviews
     hexCalcExplorerProvider = new HexCalcProvider();

diff --git a/src/regexes.ts b/src/regexes.ts
@@ -82,7 +82,7 @@ export function regexEndModuleStruct(): RegExp {
  * Used by DefinitionProvider.
  */
 export function regexLabelColonForWord(searchWord: string): RegExp {
-    return new RegExp('^(\\s*)([^0-9\\.\\s][\\w\\.]*)?\\b' + searchWord + ':');
+    return new RegExp('^(\\s*)([^0-9\\s][\\w\\.]*)?\\b' + searchWord + ':');
 }
 
 
@@ -94,7 +94,7 @@ export function regexLabelColonForWord(searchWord: string): RegExp {
  * Used by DefinitionProvider.
  */
 export function regexLabelWithoutColonForWord(searchWord: string): RegExp {
-    return new RegExp('^()([^0-9\\.\\s][\\w\\.]*)?\\b' + searchWord + '\\b(?![:\\.])');
+    return new RegExp('^()([^0-9\\s][\\w\\.]*)?\\b' + searchWord + '\\b(?![:\\.])');
 }
 
 

diff --git a/tests/regexes.tests.ts b/tests/regexes.tests.ts
@@ -319,7 +319,7 @@ suite('RegExes', () => {
                 "label", "xxx.label:", true, "",
                 "label", "_xxx.label:", true, "",
                 "label", "0xxx.label:", false, "",
-                "label", ".label:", false, "",
+                //"label", ".label:", false, "",    // Required for issue #30: Goto definition to local label not working
                 "label", "label.xxx:", false, "",
                 "label", "yyy.label.xxx:", false, "",
                 "label", "xlabel:", false, "",
@@ -351,7 +351,7 @@ suite('RegExes', () => {
                 "label", "xxx.label", true, "",
                 "label", "_xxx.label", true, "",
                 "label", "0xxx.label", false, "",
-                "label", ".label", false, "",
+                //"label", ".label", false, "",   // Required for issue #30: Goto definition to local label not working
                 "label", "label.xxx", false, "",
                 "label", "yyy.label.xxx", false, "",
                 "label", "xlabel", false, "",