Skip to content

Commit 49ccc8d

Browse files
committed
Merge branch 'release-0.4' into master
2 parents 045ede7 + c483562 commit 49ccc8d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+2240
-991
lines changed

.eslintignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
vscode.proposed.d.ts

.eslintrc.js

Lines changed: 17 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,22 @@
1-
/*
2-
👋 Hi! This file was autogenerated by tslint-to-eslint-config.
3-
https://github.com/typescript-eslint/tslint-to-eslint-config
4-
5-
It represents the closest reasonable ESLint configuration to this
6-
project's original TSLint configuration.
7-
8-
We recommend eventually switching this configuration to extend from
9-
the recommended rulesets in typescript-eslint.
10-
https://github.com/typescript-eslint/tslint-to-eslint-config/blob/master/docs/FAQs.md
11-
12-
Happy linting! 💖
13-
*/
1+
/**@type {import('eslint').Linter.Config} */
2+
// eslint-disable-next-line no-undef
143
module.exports = {
15-
"env": {
16-
"es6": true,
17-
"node": true
18-
},
19-
"parser": "@typescript-eslint/parser",
20-
"parserOptions": {
21-
"sourceType": "module"
22-
},
23-
"plugins": [
4+
root: true,
5+
parser: "@typescript-eslint/parser",
6+
plugins: [
247
"@typescript-eslint"
258
],
26-
"rules": {
27-
"@typescript-eslint/class-name-casing": "warn",
28-
"@typescript-eslint/member-delimiter-style": [
29-
"warn",
30-
{
31-
"multiline": {
32-
"delimiter": "semi",
33-
"requireLast": true
34-
},
35-
"singleline": {
36-
"delimiter": "semi",
37-
"requireLast": false
38-
}
39-
}
40-
],
41-
"@typescript-eslint/semi": [
42-
"warn",
43-
"always"
44-
],
45-
"curly": "warn",
46-
"eqeqeq": [
47-
"warn",
48-
"always"
49-
],
50-
"no-redeclare": "warn",
51-
"no-throw-literal": "warn",
52-
"no-unused-expressions": "warn"
9+
extends: [
10+
'eslint:recommended',
11+
'plugin:@typescript-eslint/recommended',
12+
],
13+
rules: {
14+
'semi': [2, "always"],
15+
'@typescript-eslint/no-unused-vars': 0,
16+
'@typescript-eslint/no-explicit-any': 0,
17+
'@typescript-eslint/explicit-module-boundary-types': 0,
18+
'@typescript-eslint/no-non-null-assertion': 0,
19+
'@typescript-eslint/no-namespace': 0,
20+
'no-inner-declarations': 0,
5321
}
5422
};

.github/CODEOWNERS

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
# These owners will be the default owners for everything in the repo.
2+
* @mikecentola
3+

.markdownlint.json

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"default": true,
3+
"line-length": false,
4+
"no-inline-html": false,
5+
"first-line-heading": false
6+
}

.vscode/launch.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,32 +3,34 @@
33
"version": "0.2.0",
44
"configurations": [
55
{
6-
"name": "Run Extension",
6+
"name": "Launch Extension",
77
"type": "extensionHost",
88
"request": "launch",
99
"runtimeExecutable": "${execPath}",
1010
"args": [
1111
"--disable-extensions",
1212
"--extensionDevelopmentPath=${workspaceFolder}"
1313
],
14+
"stopOnEntry": false,
1415
"outFiles": [
1516
"${workspaceFolder}/out/**/*.js"
1617
],
1718
"preLaunchTask": "${defaultBuildTask}"
1819
},
1920
{
20-
"name": "Extension Tests",
21+
"name": "Launch Extension Tests",
2122
"type": "extensionHost",
2223
"request": "launch",
2324
"runtimeExecutable": "${execPath}",
2425
"args": [
2526
"--extensionDevelopmentPath=${workspaceFolder}",
2627
"--extensionsTestsPath=${workspaceFolder}/out/test/suite/index"
2728
],
29+
"stopOnEntry": false,
2830
"outFiles": [
2931
"${workspaceFolder}/out/**/*.js"
3032
],
31-
"preLaunchTask": "${defaultBuildTask"
33+
"preLaunchTask": "${defaultBuildTask}"
3234
}
3335
]
3436
}

.vscodeignore

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
.github/**
12
.vscode/**
23
.vscode-test/**
34
out/test/**
@@ -10,4 +11,8 @@ tslint.json
1011
package-lock.json
1112
vsc-extension-quickstart.md
1213
images/*.ai
13-
images/*.svg
14+
images/*.svg
15+
LICENSE
16+
CONTRIBUTING.md
17+
node_modules/**
18+
.eslintignore

CHANGELOG.md

Lines changed: 38 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,38 @@
22

33
All changes to vscode-code-syntax will be documented here.
44

5+
## v0.4.0 [#](https://github.com/appliedengesign/vscode-gcode-syntax/releases/tag/v0.4.0)
6+
7+
Finally a major update to vscode-gcode-syntax!
8+
9+
### New Features
10+
11+
- Added `G65`, `M97` and `M99` to tree info
12+
- Added spindle speed and direction to tree info
13+
- Added `M03` and `M04` snippets
14+
- Added `.001` extension to supported files ( [#11](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/11) )
15+
- Added Status Bar implementation for Tree messages
16+
- Added Stats view (Currently only displays number of Tool Changes)
17+
18+
### Fixes
19+
20+
- Added `E` feed rate colorization
21+
- Fixed mocha test error `useColors -> color`
22+
- Updated all dependencies
23+
- Updated copyright info
24+
- Refactored constants and removed hardcoded manifest
25+
- Rewrote entire console logging to use Logger class (Future ability to specify log level)
26+
- Modfied view contexts to change when not viewing g-code instead of hiding views
27+
- Refactored import declations to improve performance
28+
- Modified configuration variables
29+
- Updated README with more information about settings.
30+
31+
### Other
32+
33+
- Added Contributor Covenant
34+
- Added CODEOWNERS File
35+
- Added markdownlint config
36+
537
## v0.3.3 [#](https://github.com/appliedengesign/vscode-gcode-syntax/releases/tag/v0.3.3)
638

739
- Updated dependencies to fix some security vulnerabilities
@@ -10,14 +42,14 @@ All changes to vscode-code-syntax will be documented here.
1042

1143
## v0.3.2 [#](https://github.com/appliedengesign/vscode-gcode-syntax/releases/tag/v0.3.2)
1244

13-
- Fixed Markup with division symbol [#9](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/7)
45+
- Fixed Markup with division symbol ( [#9](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/7) )
1446
- Fixed typo in src manifest
1547
- Updated dependencies
1648

1749
## v0.3.1 [#](https://github.com/appliedengesign/vscode-gcode-syntax/releases/tag/v0.3.1)
1850

1951
- Added ```.prg``` file extension [#7](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/7)
20-
- Moved activity bar icon into resources folder. [#5](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/5)
52+
- Moved activity bar icon into resources folder. ( [#5](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/5) )
2153

2254
## v0.3.0 [#](https://github.com/appliedengdesign/vscode-gcode-syntax/releases/tag/v0.3.0)
2355

@@ -28,8 +60,8 @@ All changes to vscode-code-syntax will be documented here.
2860
## v0.2.0 [#](https://github.com/appliedengdesign/vscode-gcode-syntax/releases/tag/v0.2.0)
2961

3062
- Refactor extension code for new vscode extension syntax
31-
- Added ```.eia``` file extension [#4](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/4)
32-
- Fixed compound macro variable syntax highlighting [#3](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/4)
63+
- Added ```.eia``` file extension ( [#4](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/4) )
64+
- Fixed compound macro variable syntax highlighting ( [#3](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/3) )
3365
- Updated dependencies & dev dependencies
3466
- Added standard vscode testing to source code
3567
- Added dedicated output channel "G-Code" when activated
@@ -41,8 +73,8 @@ All changes to vscode-code-syntax will be documented here.
4173

4274
## v0.1.1 [#](https://github.com/appliedengdesign/vscode-gcode-syntax/releases/tag/v0.1.1)
4375

44-
- Fixed Incorrect highlighting for DO / END - [#2](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/2)
45-
- Fixed Math expressions incorrectly highlighted - [#1](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/1)
76+
- Fixed Incorrect highlighting for DO / END ( [#2](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/2) )
77+
- Fixed Math expressions incorrectly highlighted ( [#1](https://github.com/appliedengdesign/vscode-gcode-syntax/issues/1) )
4678

4779
## v0.1.0 [#](https://github.com/appliedengdesign/vscode-gcode-syntax/releases/tag/v0.1.0)
4880

CODE_OF_CONDUCT.md

Lines changed: 129 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,129 @@
1+
2+
# Contributor Covenant Code of Conduct
3+
4+
## Our Pledge
5+
6+
We as members, contributors, and leaders pledge to make participation in our
7+
community a harassment-free experience for everyone, regardless of age, body
8+
size, visible or invisible disability, ethnicity, sex characteristics, gender
9+
identity and expression, level of experience, education, socio-economic status,
10+
nationality, personal appearance, race, religion, or sexual identity
11+
and orientation.
12+
13+
We pledge to act and interact in ways that contribute to an open, welcoming,
14+
diverse, inclusive, and healthy community.
15+
16+
## Our Standards
17+
18+
Examples of behavior that contributes to a positive environment for our
19+
community include:
20+
21+
* Demonstrating empathy and kindness toward other people
22+
* Being respectful of differing opinions, viewpoints, and experiences
23+
* Giving and gracefully accepting constructive feedback
24+
* Accepting responsibility and apologizing to those affected by our mistakes,
25+
and learning from the experience
26+
* Focusing on what is best not just for us as individuals, but for the
27+
overall community
28+
29+
Examples of unacceptable behavior include:
30+
31+
* The use of sexualized language or imagery, and sexual attention or
32+
advances of any kind
33+
* Trolling, insulting or derogatory comments, and personal or political attacks
34+
* Public or private harassment
35+
* Publishing others' private information, such as a physical or email
36+
address, without their explicit permission
37+
* Other conduct which could reasonably be considered inappropriate in a
38+
professional setting
39+
40+
## Enforcement Responsibilities
41+
42+
Community leaders are responsible for clarifying and enforcing our standards of
43+
acceptable behavior and will take appropriate and fair corrective action in
44+
response to any behavior that they deem inappropriate, threatening, offensive,
45+
or harmful.
46+
47+
Community leaders have the right and responsibility to remove, edit, or reject
48+
comments, commits, code, wiki edits, issues, and other contributions that are
49+
not aligned to this Code of Conduct, and will communicate reasons for moderation
50+
decisions when appropriate.
51+
52+
## Scope
53+
54+
This Code of Conduct applies within all community spaces, and also applies when
55+
an individual is officially representing the community in public spaces.
56+
Examples of representing our community include using an official e-mail address,
57+
posting via an official social media account, or acting as an appointed
58+
representative at an online or offline event.
59+
60+
## Enforcement
61+
62+
Instances of abusive, harassing, or otherwise unacceptable behavior may be
63+
reported to the community leaders responsible for enforcement at
64+
65+
All complaints will be reviewed and investigated promptly and fairly.
66+
67+
All community leaders are obligated to respect the privacy and security of the
68+
reporter of any incident.
69+
70+
## Enforcement Guidelines
71+
72+
Community leaders will follow these Community Impact Guidelines in determining
73+
the consequences for any action they deem in violation of this Code of Conduct:
74+
75+
### 1. Correction
76+
77+
**Community Impact**: Use of inappropriate language or other behavior deemed
78+
unprofessional or unwelcome in the community.
79+
80+
**Consequence**: A private, written warning from community leaders, providing
81+
clarity around the nature of the violation and an explanation of why the
82+
behavior was inappropriate. A public apology may be requested.
83+
84+
### 2. Warning
85+
86+
**Community Impact**: A violation through a single incident or series
87+
of actions.
88+
89+
**Consequence**: A warning with consequences for continued behavior. No
90+
interaction with the people involved, including unsolicited interaction with
91+
those enforcing the Code of Conduct, for a specified period of time. This
92+
includes avoiding interactions in community spaces as well as external channels
93+
like social media. Violating these terms may lead to a temporary or
94+
permanent ban.
95+
96+
### 3. Temporary Ban
97+
98+
**Community Impact**: A serious violation of community standards, including
99+
sustained inappropriate behavior.
100+
101+
**Consequence**: A temporary ban from any sort of interaction or public
102+
communication with the community for a specified period of time. No public or
103+
private interaction with the people involved, including unsolicited interaction
104+
with those enforcing the Code of Conduct, is allowed during this period.
105+
Violating these terms may lead to a permanent ban.
106+
107+
### 4. Permanent Ban
108+
109+
**Community Impact**: Demonstrating a pattern of violation of community
110+
standards, including sustained inappropriate behavior, harassment of an
111+
individual, or aggression toward or disparagement of classes of individuals.
112+
113+
**Consequence**: A permanent ban from any sort of public interaction within
114+
the community.
115+
116+
## Attribution
117+
118+
This Code of Conduct is adapted from the [Contributor Covenant][homepage],
119+
version 2.0, available at
120+
https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
121+
122+
Community Impact Guidelines were inspired by [Mozilla's code of conduct
123+
enforcement ladder](https://github.com/mozilla/diversity).
124+
125+
[homepage]: https://www.contributor-covenant.org
126+
127+
For answers to common questions about this code of conduct, see the FAQ at
128+
https://www.contributor-covenant.org/faq. Translations are available at
129+
https://www.contributor-covenant.org/translations.

LICENSE

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
MIT License
22

3-
Copyright (c) 2019 Applied Engineering & Design
3+
Copyright (c) 2020 Applied Engineering & Design
44

55
Permission is hereby granted, free of charge, to any person obtaining a copy
66
of this software and associated documentation files (the "Software"), to deal

0 commit comments

Comments
 (0)