Skip to content

Commit 264f7d2

Browse files
committed
Merge branch 'master' into feature/formatting
2 parents 1041142 + 92c6884 commit 264f7d2

File tree

5 files changed

+188
-318
lines changed

5 files changed

+188
-318
lines changed

.github/workflows/main.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ jobs:
1414
node-version: ${{ matrix.node-version }}
1515
- name: Installing Extension
1616
run: yarn install
17+
- name: Compile
18+
run: yarn compile
1719
- name: Test Syntax Highlighting
1820
run: yarn test:grammar
1921
- name: Test Unittests

CHANGELOG.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
99

1010
## [2.5.0]
1111

12+
### Added
13+
14+
- Adds support for formatting with `findent` and `fprettify`
15+
([#29](https://github.com/krvajal/vscode-fortran-support/issues/29))
16+
17+
## [2.4.2]
18+
1219
### Fixed
1320

1421
- Extension now activates for `FortranFixedForm`
@@ -26,8 +33,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
2633

2734
### Added
2835

29-
- Adds support for formatting with `findent` and `fprettify`
30-
([#29](https://github.com/krvajal/vscode-fortran-support/issues/29))
3136
- Adds prompts for installing Fortran IntelliSense and fortran-language-server
3237

3338
### Removed
@@ -301,7 +306,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
301306
- Initial release
302307

303308
[unreleased]: https://github.com/krvajal/vscode-fortran-support/compare/v2.5.0...HEAD
304-
[2.5.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.4.0...v2.5.0
309+
[2.5.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.4.2...v2.5.0
310+
[2.4.2]: https://github.com/krvajal/vscode-fortran-support/compare/v2.4.1...v2.4.2
311+
[2.4.1]: https://github.com/krvajal/vscode-fortran-support/compare/v2.4.0...v2.4.1
305312
[2.4.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.3.0...v2.4.0
306313
[2.3.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.2.2...v2.3.0
307314
[2.2.2]: https://github.com/krvajal/vscode-fortran-support/compare/2.2.1...v2.2.1

0 commit comments

Comments
 (0)