Merge pull request #45 from appliedengdesign/release/0.7.5

Release 0.7.5

Author: mikecentola

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,22 +1,49 @@
-## Thank you for contributing to VSCode-GCode-Syntax
+<!---
 
-### Please create an issue _before_ creating a pull request
+Thank you for contributing to VSode GCode Syntax! :)
 
-### DESCRIPTION
+Before you submit, please read the following:
 
-<!-- PUT GENERAL DESRIPTION OF PULL REQUEST HERE -->
+Search open/closed issues before submitting. Someone may have pushed the same code before.
 
-FIXES ISSUE # <!-- PUT ISSUE NUMBER HERE -->
+Provide a clear & concise title in the field above.
 
-### CHECKLIST
+- Please create an issue _before_ creating a Pull Request
 
-<!-- Please check off the following -->
+-->
+
+# Pull Request
+
+## Description
+
+<!--
+Please include a summary of the changes and which issue or issues it will address. Please also include context and reasoning for pull request.
+-->
+
+## Issues
+
+<!--
+
+    * List and link any relevant issues here.
 
-- [ ] I have read the guidelines in the [CONTRIBUTING](https://github.com./appliedengdesign/vscode-gcode-syntax/blob/master/CONTRIBUTING.md) document
-- [ ] My changes follow the coding style, have been formated & linted
-- [ ] My changes have a descripted commit message
-- [ ] My commits are GPG signed
+-->
 
-#### ADDITONAL NOTES
+## Reviewer Notes
+
+<!--
+
+    Provide any notes for reviewers to help them provide feedback or testing.
+
+-->
+
+## Checklist
+
+<!-- Please check off the following -->
 
-<!-- Put any additional notes in here -->
+- [] I have followed the guidelines in the [Contributing](https://github.com./appliedengdesign/vscode-gcode-syntax/blob/main/CONTRIBUTING.md) document.
+- [] I have followed the [Code of Conduct](https://github.com./appliedengdesign/vscode-gcode-syntax/blob/main/CODE_OF_CONDUCT.md) for this project.
+- [] My changes follow the coding style of this project.
+- [] My changes have been formatted and linted.
+- [] I have made any relevant changes to the documentation as needed (include CHANGELOG.md and/or README.md).
+- [] My changes have a descriptive commit message with a short title, including links to issues it addresses.
+- [] I had fun.

.vscode/launch.json

@@ -14,7 +14,8 @@
                 "--extensionDevelopmentPath=${workspaceFolder}",
                 "${workspaceFolder}/samplenc/sample-colors.nc",
                 "${workspaceFolder}/samplenc/sample-profile.nc",
-                "${workspaceFolder}/samplenc/sample-circular-pocket.nc"
+                "${workspaceFolder}/samplenc/sample-circular-pocket.nc",
+                "${workspaceFolder}/samplenc/sample-mill-metric.nc"
             ],
             "cwd": "${workspaceFolder}",
             "outFiles": [

CHANGELOG.md

@@ -2,6 +2,30 @@
 
 All changes to G-Code Language Extension will be documented here.
 
+## v0.7.5 [#](https://github.com./appliedengdesign/vscode-gcode-syntax/releases/tag/v0.7.4)
+
+### Fixes
+
+- Fixed typo in G01 tooltip
+- Updated dependencies
+- Added Laser/EDM/Swiss to machine type configuration (to match gcode-reference)
+
+### Other
+
+- Updated CodeQL Analysis to v2
+- Updated prettier config
+- Updated module to ES2021
+- Changed usage of substr to slice
+- Added sample to extension debug launch
+- Fixed Mocha test
+- Added node modules refresh script
+- Renamed `views.ts` to `gView.ts`
+- Renamed `webviews.ts` to `gWebview.ts`
+- Fixed stale action settings
+- Added lock older closed issues
+- Added greetings automation
+- Updated README
+
 ## v0.7.4 [#](https://github.com./appliedengdesign/vscode-gcode-syntax/releases/tag/v0.7.4)
 
 ### Other

CONTRIBUTING.md

@@ -1,27 +1,84 @@
-# How to contribute
+# Contribute to VSCode GCode Syntax
 
-If you would like to contribute to the vscode-gcode-syntax project, here are a couple guidelines.
+Thank you for your interest in contributing to the VSCode GCode Syntax project. Please note the [Code of Conduct](CODE_OF_CONDUCT.md) document and follow it in all of your interactions with this project.
+
+There are a variety of ways you can contribute to this project.
+
+- Help answer issues or questions on using the extension
+- Find Bugs and Fix them!
+- Work on new features!
+- Fix Typos! (I make a lot of them)
+- Edit Documentation
+
+Here are a couple guidelines to get you started...
 
 ## Getting Started
 
-* Fork the repository on GitHub
-* Create a feature branch based on the development branch
+To contribute to [VSCode GCode Syntax](https://github.com./appliedengdesign/vscode-gcode-syntax), you need to fork this repository and submit a pull request for any changes.
+
+- [How to fork a repository](https://help.github.com./articles/fork-a-repo)
+- [How to make a pull request](https://help.github.com./articles/creating-a-pull-request/)
+- [Changing a commit message](https://help.github.com./articles/changing-a-commit-message/)
+- [How to squash commits](https://help.github.com./articles/about-pull-request-merges/)
+
+Search open/closed issues before submitting any code changes because someone may have pushed the same code before.
+
+Please create an issue _before_ creating your pull request.
+
+### Branches
+
+Create a local working branch that is specific to the scope of the changes that you want to make and then submit a pull request when your changes are ready. Each branch you create should be as specific as possible to streamline work flow and to reduce the possibility of merge conflicts. For instance, consider creating a branch to work on documentation or to fix a typo.
+
+### Formatting
+
+This project contains an [`.editorconfig`](https://github.com./appliedengdesign/vscode-gcode-syntax/blob/main/.editorconfig) file. If your IDE or code editor doesn't natively support it, please install the [EditorConfig](https://editorconfig.org) plugin.
+
+This project uses [prettier](https://prettier.io/) for code formatting. You can run prettier across the code by calling `npm run pretty` from a terminal.
+
+To format the code as you make changes you can install the [Prettier - Code formatter](https://marketplace.visualstudio.com/items/esbenp.prettier-vscode) extension.
+
+Add the following to your User Settings to run prettier:
+
+`"editor.formatOnSave": true,`
+
+### Linting
+
+This project uses [ESLint](https://eslint.org/) for code linting. You can run ESLint across the code by calling `npm run lint` from a terminal. Warnings from ESLint show up in the `Errors and Warnings` quick box and you can navigate to them from inside VS Code.
+
+To lint the code as you make changes you can install the [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint) extension.
+
+### Update the README
+
+If this is your first contribution to GCode Reference, please give yourself credit by adding yourself to the _Contributors_ section of the [README](README.md) in the following format:
+
+- `Your Name ([@<your-github-username>(https://github.com./<your-github-username)]) - [contributions](https://github.com./appliedengdesign/vscode-gcode-syntax/commits?author=<your-github-username>`
+
+### Signing Your Commits
+
+This project requires that commits are GPG signed. This ensures that YOU are really the author of your commit, and the code is REALLY what you wrote.
+
+Check out this article: [How (and why) to sign Git commits](https://withblue.ink/2020/05/17/how-and-why-to-sign-git-commits.html)
+
+### Authoring Tools
+
+[Visual Studio Code](https://code.visualstudio.com) is a preferred tool to work on this project.
+
+#### Recommended Extensions
 
-## Making Changes
+- [ESLint](https://marketplace.visualstudio.com/items?itemName=dbaeumer.vscode-eslint)
+- [Prettier](https://marketplace.visualstudio.com/items?itemName=esbenp.prettier-vscode)
 
-* Make changes in your separate branch
-* Make sure commit messages are easy to understand
-* Make sure to test your extension as much as possible
+### Submitting a Pull Request
 
-## Submitting Changes
+Please follow all instructions in the [PR template](.github/PULL_REQUEST_TEMPLATE.md).
 
-* Push your changes to the branch in your fork of the repository.
-* Submit a pull request to the [development branch](https://github.com./appliedengdesign/vscode-gcode-syntax/tree/dev) of the [vscode-gcode-syntax](https://github.com./appliedengdesign/vscode-gcode-syntax) respository.
-* Make sure to explicitly say not to complete pull request if you are still making changes.
+- Push your changes to your branch in your fork of the repository.
+- Submit a pull request to the [master](https://github.com./appliedengdesign/master-syntax/tree/master) of the [vscode-gcode-syntax](https://github.com./appliedengdesign/vscode-gcode-syntax) respository.
+- Make sure to explicitly say not to complete pull request if you are still making changes.
 
 ## Additional Resources
 
-* [GitHub Docs](http://help.github.com./)
-* [GitHub Pull Request Docs](http://help.github.com./send-pull-requests/)
-* [Successful Git Branching Model](http://nvie.com/posts/a-successful-git-branching-model/)
+- [GitHub Docs](http://help.github.com./)
+- [GitHub Pull Request Docs](http://help.github.com./send-pull-requests/)
+- [Successful Git Branching Model](http://nvie.com/posts/a-successful-git-branching-model/)
 

README.md

@@ -131,6 +131,7 @@ Please visit our [GitHub Issues](https://github.com./appliedengdesign/vscode-gcod
 
 - Add more snippets
 - Add additional tree items.
+- Machining Calculator
 - More Statistics
 - G-Code Debugging
 - Backplotter
@@ -141,7 +142,7 @@ Visit our [projects page](https://github.com./appliedengdesign/vscode-gcode-synta
 
 ## Changelog
 
-Latest Version: v0.7.4
+Latest Version: v0.7.5
 
 Please refer to our [CHANGELOG](https://github.com./appliedengdesign/vscode-gcode-syntax/blob/master/CHANGELOG.md) doc.
 
@@ -151,6 +152,12 @@ If you work like to help contribute to the code or this project, please fork awa
 
 For more information on contributing, please refer to the [CONTRIBUTING](https://github.com./appliedengdesign/vscode-gcode-syntax/blob/master/CONTRIBUTING.md) doc.
 
+### Contributors
+
+- Mike Centola ([@mikecentola](https://github.com./mikecentola)) - [contributions](https://github.com./appliedengdesign/vscode-gcode-syntax/commits?author=mikecentola)
+- Zach Allaun ([@zachallaun](https://github.com./zachallaun)) - [contributions](https://github.com./appliedengdesign/vscode-gcode-syntax/commits?author=zachallaun)
+- Patrick Connolly ([@patcon](https://github.com./patcon)) - [contributions](https://github.com./appliedengdesign/vscode-gcode-syntax/commits?author=patcon)
+
 ## About Applied Eng & Design
 
 We are a full service engineering and design firm, specializing in CAD/CAM, CNC milling, rapid prototyping, training and more.  We also like to dabble in Arudino / RaspberryPi projects, electronics, drones and robotics projects! Subscribe to our YouTube channel for videos on our projects, screencast tutorials, and more!