Skip to content

Commit fe80c9b

Browse files
authored
Merge branch 'Scony:master' into master
2 parents ba4428a + f836958 commit fe80c9b

66 files changed

Lines changed: 984 additions & 1051 deletions

Some content is hidden

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

.github/workflows/deploy.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,10 @@ jobs:
1010

1111
steps:
1212
- name: Checkout repository
13-
uses: actions/checkout@v2
13+
uses: actions/checkout@v4
1414

1515
- name: Set up Python
16-
uses: actions/setup-python@v2
16+
uses: actions/setup-python@v5
1717
with:
1818
python-version: '3.7'
1919

.github/workflows/tests.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,15 @@ jobs:
99
strategy:
1010
fail-fast: false
1111
matrix:
12-
python-version: [3.7, 3.8, 3.9, '3.10']
12+
python-version: [3.8, 3.9, '3.10', '3.11', '3.12']
1313
os: [ubuntu-latest, windows-latest, macos-latest]
1414

1515
steps:
1616
- name: Checkout repository
17-
uses: actions/checkout@v2
17+
uses: actions/checkout@v4
1818

1919
- name: Set up Python ${{ matrix.python-version }} on ${{ matrix.os }}
20-
uses: actions/setup-python@v2
20+
uses: actions/setup-python@v5
2121
with:
2222
python-version: ${{ matrix.python-version }}
2323

.gitmodules

Lines changed: 0 additions & 3 deletions
This file was deleted.

CHANGELOG.md

Lines changed: 28 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,37 @@
11
# Changelog
22

3-
## [not released]
3+
## [master]
4+
5+
### Added
6+
- Added `gdformatrc` configuration file to `gdformat`
7+
- Added support for Allman-style enum definitions to parser
8+
- Added support for string-based unique node names
9+
- Added support for properties in `gd2py`
10+
- Added support for `get():` property syntax
11+
- Added support for multiline arrays and dictionaries in `match` statement branches
12+
- Added support for guarded `match` branches
13+
14+
### Changed
15+
- Fixed support for `breakpoint` statement in formatter
16+
17+
## [4.2.2] 2023-12-11
18+
19+
### Changed
20+
- Fixed support for r-strings
21+
22+
## [4.2.1] 2023-12-10
23+
24+
### Added
25+
- Added support for multiline patterns within `match` statement branches
26+
- Added support for r-strings
27+
28+
## [4.2.0] 2023-11-30
429

530
### Added
631
- Added support for `breakpoint` statement
732
- Added support for function-level annotations
833
- Added support for typed `for` loop iterator (#241)
34+
- Added the `--use-spaces=<int>` option to `gdformat` so that space-based indentations can be used instead of tab-based ones
935

1036
### Changed
1137
- Fixed `max-public-methods` linter check disabling (#222)
@@ -14,6 +40,7 @@
1440
- Fixed linter support for docstrings (#233)
1541
- Fixed linter support for trailing comma in function's args list (#206)
1642
- Fixed linter support for static variables and classnames bundled with `extends` (#242)
43+
- Enforced function statement annotations to be formatted to separate lines (#252)
1744

1845
## [4.1.0] 2023-07-06
1946

README.md

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,32 @@ tests/gd2py/input-output-pairs/func-level-statements.in.gd
133133
F 1:0 foo - B (8)
134134
```
135135

136+
## Using gdtoolkit's GitHub action
137+
138+
In order to setup a simple action with gdtoolkit's static checks, the base action from this repo can be used:
139+
140+
```
141+
name: Static checks
142+
143+
on:
144+
push:
145+
branches: [ "main" ]
146+
pull_request:
147+
branches: [ "main" ]
148+
149+
jobs:
150+
static-checks:
151+
name: 'Static checks'
152+
runs-on: ubuntu-latest
153+
steps:
154+
- uses: actions/checkout@v4
155+
- uses: Scony/godot-gdscript-toolkit@master
156+
- run: gdformat --check source/
157+
- run: gdlint source/
158+
```
159+
160+
See the discussion in https://github.com/Scony/godot-gdscript-toolkit/issues/239 for more details.
161+
136162
## Development [(more)](https://github.com/Scony/godot-gdscript-toolkit/wiki/5.-Development)
137163

138164
Everyone is free to fix bugs or introduce new features. For that, however, please refer to existing issue or create one before starting implementation.

action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ runs:
2121
shell: bash
2222

2323
- id: install-python
24-
uses: actions/setup-python@v4
24+
uses: actions/setup-python@v5
2525
with:
2626
python-version: "3.x"
2727
cache: "pip"

editor-plugins/godot

Lines changed: 0 additions & 1 deletion
This file was deleted.

editor-plugins/vscode/.eslintrc.json

Lines changed: 0 additions & 19 deletions
This file was deleted.

editor-plugins/vscode/.gitignore

Lines changed: 0 additions & 111 deletions
This file was deleted.

editor-plugins/vscode/.vscode/extensions.json

Lines changed: 0 additions & 7 deletions
This file was deleted.

0 commit comments

Comments
 (0)