Merge commit 'a3f052721ff4de647490786d102e822779230360'

.github/dependabot.yml

@@ -0,0 +1,7 @@
+ - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    target-branch: "develop"
+    labels:
+      - "dependencies"

.vscode/settings.json

@@ -5,5 +5,6 @@
 	"typescript.preferences.quoteStyle": "single",
 	"editor.codeActionsOnSave": {
 		"source.fixAll.eslint": true
-	}
+	},
+	"editor.bracketPairColorization.enabled": true
 }

CHANGELOG.md

@@ -1,3 +1,16 @@
+## 0.4.0  (-)
+- Function call hierarchy
+- Formatting provider
+- Prepare rename provider for better rename experience
+- Outline shows the linked symbol code
+- Add support for system variables
+- Bug fixes
+	- https://github.com/iSorp/macro-executor/issues/23
+	- https://github.com/iSorp/macro-executor/issues/22
+	- https://github.com/iSorp/macro-executor/issues/21
+	- Ignore duplicate sequence number on data input G10/G11
+	- Fix error when using single files instead of workspaces
+
 ## 0.3.3  (April 16, 2021)
 - NN address parsing
 

README.md

@@ -2,7 +2,6 @@
 
 <img src="./resources/icon.png" alt="drawing" width="100"/>
 
-![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,8 +11,8 @@ Visual Studio Code extension with support for the Fanuc Macro Executor programmi
 
 
 ## News
-- The Fanuc Macro Executor extension parses now any symbol definition, like GOTOs, Assignments, etc. 
-- Spaces between statements are no longer necessary.  
+- Document formatting
+- Function call hierarchy for incoming and outgoing calls
 
 ***
        
@@ -28,6 +27,8 @@ Visual Studio Code extension with support for the Fanuc Macro Executor programmi
 * CodeLens
 * Lint features
 * Sequence number refactoring
+* Function call hierarchy
+* Formatting provider
 
 ## Supported display languages
 * English `en`
@@ -223,7 +224,8 @@ Three levels are supported: `error`, `warning` and `ignore`.
               "includeNotFound":          "error",
               "assignmentConstant":       "Ignore",
               "blockDelNumber":           "error",
-              "unsuitableNNAddress":      "warning"
+              "unsuitableNNAddress":      "warning",
+			  "dataInputNotClosed" :      "error"
        }
 ```
 
@@ -240,6 +242,7 @@ Three levels are supported: `error`, `warning` and `ignore`.
 
 This extension contributes the following settings:
 
+* `macro.callFunctions` : Custom call functions (default: M98, G65)
 * `macro.keywords` : [Custom Keywords](#custom-Keywords)
 * `macro.lint`: Lint settings and rule configuration
 * `macro.sequence.base`: Sequences start number for refactoring
@@ -375,4 +378,4 @@ Below an example [task](https://code.visualstudio.com/Docs/editor/tasks) definit
 
 Special thanks to Pan and Yu for translating the chinese texts
 
-特别感谢潘先生和于先生翻译了中文文本
+特别感谢潘先生和于先生翻译了中文文本

azure-pipelines.yml

@@ -5,7 +5,7 @@ trigger:
     - develop
   tags:
     include:
-    - v*
+    - refs/tags/v*
 
 strategy:
   matrix:
@@ -23,7 +23,7 @@ steps:
 
 - task: NodeTool@0
   inputs:
-    versionSpec: '10.x'
+    versionSpec: '16.x'
   displayName: 'Install Node.js'
 
 - bash: |
@@ -40,3 +40,11 @@ steps:
   displayName: Run Tests
   env:
     DISPLAY: ':99.0'
+
+- bash: |
+    echo ">>> Publish"
+    yarn deploy
+  displayName: Publish
+  condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags/'), eq(variables['Agent.OS'], 'Windows'))
+  env:
+    VSCE_PAT: $(VSCE_PAT)