Merge branch 'release-0.7'

appliedengdesign · Nov 30, 2021 · 2b58a2c · 2b58a2c
2 parents 454a917 + 28c8453
commit 2b58a2c
Show file tree

Hide file tree

Showing 29 changed files with 3,098 additions and 2,098 deletions.
diff --git a/.eslintrc.json b/.eslintrc.json
@@ -50,6 +50,7 @@
         ],
         "@typescript-eslint/no-namespace": "off",
         "@typescript-eslint/no-non-null-assertion": "off",
+        "@typescript-eslint/no-unsafe-argument": "off",
         "@typescript-eslint/no-unused-vars": [
             "warn",
             {

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -9,6 +9,7 @@
             "runtimeExecutable": "${execPath}",
             "args": [
                 "--disable-extensions",
+                "--trace-depreciation",
                 "--extensionDevelopmentPath=${workspaceFolder}",
                 "${workspaceFolder}/samplenc/sample-colors.nc",
                 "${workspaceFolder}/samplenc/sample-profile.nc"
@@ -37,9 +38,8 @@
             "runtimeExecutable": "${execPath}",
             "args": [
                 "--disable-extensions",
-                "--extensionDevelopmentPath=${workspaceFolder}",
-                "${workspaceFolder}/samplenc/sample-colors.nc",
-                "${workspaceFolder}/samplenc/sample-profile.nc"
+                "--trace-depreciation",
+                "--extensionDevelopmentPath=${workspaceFolder}"
             ],
             "outFiles": [
                 "${workspaceFolder}/dist/**/*.js"

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,27 @@
 
 All changes to G-Code Language Extension will be documented here.
 
+## v0.7.0 [#](https://github.com/appliedengesign/vscode-gcode-syntax/releases/tag/v0.6.2)
+
+### New Features
+
+- Added line numbering command with settings in configuration
+- Line numberer Quickpick options
+
+### Fixes
+
+- Configuration files moved
+- Added default configurations
+- Updated dependencies
+- Fixed link to issue queue [#30](https://github.com/appliedengdesign/vscode-gcode-syntax/pull/30)
+- Imporoved highlighting for keywords and macro syntax [#33](https://github.com/appliedengdesign/vscode-gcode-syntax/pull/33)
+- Fixed tool change to ignore comments [#31](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/31)
+
+### Other
+
+- Added trace-depreciation to launch.json file
+- Updated README
+
 ## v0.6.2 [#](https://github.com/appliedengesign/vscode-gcode-syntax/releases/tag/v0.6.2)
 
 ### Fixes

diff --git a/README.md b/README.md
@@ -102,17 +102,23 @@ Tree view is enabled by default and can be access from the G icon on the activit
 
 G-Code Syntax is customizable and provides many configuration settings to allow the personalization of almost all features.
 
-| Name                                 | Description                                                                            |
-| ------------------------------------ | -------------------------------------------------------------------------------------- |
-| `gcode.general.hovers.enabled`       | Enable or Disable the hovers to show G-Code information                                |
-| `gcode.general.machineType`          | Choose the machine type for extension (Mill is default)                                |
-| `gcode.general.statusBars.enabled`   | Enable or Disable the G-Code status bars                                               |
-| `gcode.general.statusbars.alignment` | Choose the alignment of the status bars (Left is default)                              |
-| `gcode.general.units`                | Choose the units for the file. Options are Auto, Inch or Metric                        |
-| `gcode.views.maxAutoRefresh`         | Value for limiting the autoRefresh maximum lines                                       |
-| `gcode.views.navTree.autoRefresh`    | Tree auto-refreshes as changes are made to the g-code. ( Disabled by default )         |
-| `gcode.views.stats.autoRefresh`      | Auto-refresh the stats view when changes are made to the g-code. (Disabled by default) |
-| `gcode.views.webviews.enabled`       | Enable or disable the webviews                                                         |
+| Name                                 | Description                                                                                 |
+| ------------------------------------ | ------------------------------------------------------------------------------------------- |
+| `gcode.general.hovers.enabled`            | Enable or Disable the hovers to show G-Code information                                |
+| `gcode.general.machineType`               | Choose the machine type for extension (Mill is default)                                |
+| `gcode.general.statusBars.enabled`        | Enable or Disable the G-Code status bars                                               |
+| `gcode.general.statusbars.alignment`      | Choose the alignment of the status bars (Left is default)                              |
+| `gcode.general.units`                     | Choose the units for the file. Options are Auto, Inch or Metric                        |
+| `gcode.general.outputLevel`               | Configure Output level for debugging purposes                                          |
+| `gcode.lineNumberer.addSpaceAfter`        | Add space after line number                                                            |
+| `gcode.lineNumberer.frequency`            | Frequency of line number additions (Every Line or at Tool Changes)                     |
+| `gcode.lineNumberer.ignoreBlank`          | Ignore Blank lines when numbering                                                      |
+| `gcode.lineNumberer.ignoreComments`       | Ignore Comments when numbering                                                         |
+| `gcode.lineNumberer.ignoreProgramNumbers` | Ignore Program numbers, e.g. `O12345`                                                  |
+| `gcode.views.maxAutoRefresh`              | Value for limiting the autoRefresh maximum lines                                       |
+| `gcode.views.navTree.autoRefresh`         | Tree auto-refreshes as changes are made to the g-code. ( Disabled by default )         |
+| `gcode.views.stats.autoRefresh`           | Auto-refresh the stats view when changes are made to the g-code. (Disabled by default) |
+| `gcode.views.webviews.enabled`            | Enable or disable the webviews                                                         |
 
 ![Settings Screenshot](https://raw.githubusercontent.com/appliedengdesign/vscode-gcode-syntax/master/images/settings-screenshot.png)
 
@@ -125,7 +131,6 @@ Please visit our [GitHub Issues](https://github.com/appliedengdesign/vscode-gcod
 - Add more snippets
 - Add additional tree items.
 - More Statistics
-- Line Numbering
 - G-Code Debugging
 - Backplotter
 - Semantic Highlighting
@@ -135,7 +140,7 @@ Visit our [projects page](https://github.com/appliedengdesign/vscode-gcode-synta
 
 ## Changelog
 
-Latest Version: v0.6.2
+Latest Version: v0.7.0
 
 Please refer to our [CHANGELOG](https://github.com/appliedengdesign/vscode-gcode-syntax/blob/master/CHANGELOG.md) doc.