fix: Fix HLASM Listing highlighting on lines with trimmed whitespace (#…

…199) fix: Fix HLASM Listing highlighting on lines with trimmed whitespace fix: debugger::next race condition fix Co-authored-by: slavek-kucera <53339291+slavek-kucera@users.noreply.github.com>
eclipse-che4z · Nov 3, 2021 · 4262e27 · 4262e27
1 parent ac5cb3d
commit 4262e27
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/clients/vscode-hlasmplugin/CHANGELOG.md b/clients/vscode-hlasmplugin/CHANGELOG.md
@@ -28,6 +28,8 @@
 - Infinite loop during lookahead processing when model statement is located in copybook
 - DOT operator in string concatenation is optional
 - AINSERT operand length validation
+- HLASM Listing highligting of lines with trimmed whitespace
+- Macro tracer: step over sometimes stops inside a macro or a copy file
 
 ## [0.14.0](https://github.com/eclipse/che-che4z-lsp-for-hlasm/compare/0.13.0...0.14.0) (2021-08-18)
 

diff --git a/clients/vscode-hlasmplugin/syntaxes/hlasmListing.tmLanguage.json b/clients/vscode-hlasmplugin/syntaxes/hlasmListing.tmLanguage.json
@@ -26,7 +26,7 @@
   ],
   "repository": {
     "listing_syntax":{
-      "match": "^(.{7})(.{9})(.{22})(\\d\\d|.\\d|.[+]|.{2})(.{71,72}).*$",
+      "match": "^(.{7})(.{9})(.{22})(\\d\\d|.\\d|.[+]|.{2})(.{1,72})",
       "captures":
       {
 
@@ -35,23 +35,23 @@
       }
     },
     "listing_syntax_long":{
-      "match": "^(.{9})(.{9})(.{29})(\\d\\d|.\\d|.[+]|.{2})(.{71,72}).*$",
+      "match": "^(.{9})(.{9})(.{29})(\\d\\d|.\\d|.[+]|.{2})(.{1,72})",
       "captures":
       {
         "2":{"patterns": [ {"include": "#param_syntax"}]},
         "5":{"patterns" :[ {"include": "#hlasm_syntax"}]}
       }
     },
     "listing_syntax_endevor":{
-      "match": "^(.{8})(.{9})(.{22})(\\d\\d|.\\d|.[+]|.{2})(.{71,72}).*$",
+      "match": "^(.{8})(.{9})(.{22})(\\d\\d|.\\d|.[+]|.{2})(.{1,72})",
       "captures":
       {
         "2":{"patterns": [ {"include": "#param_syntax"}]},
         "5":{"patterns" :[ {"include": "#hlasm_syntax"}]}
       }
     },
     "listing_syntax_endevor_long":{
-      "match": "^(.{10})(.{9})(.{29})(\\d\\d|.\\d|.[+]|.{2})(.{71,72}).*$",
+      "match": "^(.{10})(.{9})(.{29})(\\d\\d|.\\d|.[+]|.{2})(.{1,72})",
       "captures":
       {
         "2":{"patterns": [ {"include": "#param_syntax"}]},

diff --git a/parser_library/src/debugging/debugger.cpp b/parser_library/src/debugging/debugger.cpp
@@ -204,6 +204,7 @@ class debugger::impl final : public processing::statement_analyzer
             stop_on_next_stmt_ = false;
             step_over_ = false;
             next_stmt_range_ = stmt_range;
+            step_over_depth_ = ctx_->processing_stack().size();
 
             continue_ = false;
             if (event_)
@@ -221,7 +222,6 @@ class debugger::impl final : public processing::statement_analyzer
         {
             std::lock_guard<std::mutex> lck(control_mtx);
             step_over_ = true;
-            step_over_depth_ = ctx_->processing_stack().size();
             continue_ = true;
         }
         con_var.notify_all();