Merge branch 'develop'

CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.3.0  (March 29, 2021)
+- Advanced Parser
+	- A virtual symbol replacement allows any definition value
+	- Concatenated statements are now valid (no blanks required)
+	- BLOCKDEL support
+- Additional unit tests
+
 ## 0.2.4  (November 10, 2020)
 - Bug fixes
 	- Completion symbol comment text fix

README.md

@@ -2,7 +2,7 @@
 
 <img src="./resources/icon.png" alt="drawing" width="100"/>
 
-![maintained](https://img.shields.io/maintenance/yes/2020.svg)
+![maintained](https://img.shields.io/maintenance/yes/2021.svg)
 [![open issues](https://img.shields.io/github/issues/iSorp/macro-executor.svg?)](https://github.com/iSorp/macro-executor/issues)
 [![license](https://img.shields.io/github/license/iSorp/macro-executor)](https://opensource.org/licenses/MIT)
 [![Build Status](https://dev.azure.com/iSorp/fanuc-macro-executor/_apis/build/status/iSorp.macro-executor?branchName=master)](https://dev.azure.com/iSorp/fanuc-macro-executor/_build/latest?definitionId=2&branchName=master)
@@ -12,7 +12,8 @@ Visual Studio Code extension with support for the Fanuc Macro Executor programmi
 
 
 ## News
-- [Additional linker parameters](#extension-settings)
+- The Fanuc Macro Executor extension parses now any symbol definition, like GOTOs, Assignments, etc. 
+- Spaces between statements are no longer necessary.  
 
 ***
        
@@ -34,10 +35,18 @@ Visual Studio Code extension with support for the Fanuc Macro Executor programmi
 * 中文 `zh-cn`
 
 ## Required file extensions
-* Macro files`.src`
+* Macro files `.src`
 * Include files `.def` 
 * Link files `.lnk` 
 
+To associate other file extensions with the macro executor language, see the following setting sample:
+
+```json
+   "files.associations": {
+        "*.PRG": "macro"
+    }
+```
+
 ## Coding conventions
 * `$Include` paths must be absolute or relative to the workspace folder
 * Uppercase for constants: `@MY_CONSTANT 100`
@@ -90,6 +99,7 @@ The global / local search behavior is equal to the reference search.
 Semantic highlighting is used to highlight the represented type of a symbol. Following types are supported:
 * M-Code and G-Code
 * Address
+* Parameter
 * Macro variable
 * Constant
 * Label
@@ -111,18 +121,18 @@ For some color themes, the semantic highlighting must be enabled in the settings
 
 ## Custom Keywords
 
-* Symbol highlighting
-* Symbol description for hover and completion
+* Highlighting
+* Description for hover and completion
 
-Out of the box the extension supports semantic highlighting for Labels (>symbol), Variables (@symbol) and M/G-Codes. Sometimes it could be useful to change the default highlighting for a particular symbol or for a type like a macro variable. 
+Out of the box the extension supports semantic highlighting for ``>``Labels, ``@``Symbols, M/G-Codes and, Variables. Sometimes it could be useful to change the default highlighting for a particular symbol or for a type like a macro variable. 
 Such a customization can be achieved by adding custom keyword items to the configuration property `macro.keywords` in the user/workspace settings:
 
 
 |     **Keyword item**| | 
 |-------------|----------------------------|
 | symbol      | Symbol text                |
 | scope       | [Scopes](#Scopes)           |
-| nodeType    | Label, Code (M/G), Variable (all @ symbols)   |
+| nodeType    | Label, Symbol, Code (M/G), Variable   |
 | description | Markdown `string` \| `string[]`   |
 
 
@@ -211,7 +221,8 @@ Three levels are supported: `error`, `warning` and `ignore`.
               "seqNotFound":              "error",   
               "incompleteParameter":      "error",
               "includeNotFound":          "error",
-              "assignmentConstant":       "warning"
+              "assignmentConstant":       "Ignore",
+              "blockDelNumber":           "error"
        }
 ```
 

azure-pipelines.yml

@@ -2,6 +2,7 @@ trigger:
   branches:
     include:
     - master
+    - develop
   tags:
     include:
     - v*
@@ -38,4 +39,4 @@ steps:
     yarn unit-test
   displayName: Run Tests
   env:
-    DISPLAY: ':99.0'
+    DISPLAY: ':99.0'