Skip to content

Commit 165e048

Browse files
committed
Merge branch 'feature/formatting' into feature/path-interpolation-simple
2 parents 2d2149c + ffeda02 commit 165e048

File tree

2 files changed

+188
-374
lines changed

2 files changed

+188
-374
lines changed

CHANGELOG.md

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

1010
## [2.5.0]
1111

12-
## Added
13-
14-
- Adds path interpolation in `includePaths` and `linterExtraArgs`
15-
- Adds glob support for `includePaths`
16-
- Adds option for global module directory output `linterModOutput`
17-
18-
## [2.4.0]
19-
20-
## Fixed
12+
### Fixed
2113

2214
- Extension now activates for `FortranFixedForm`
2315
([#257](https://github.com/krvajal/vscode-fortran-support/issues/257))
2416
- Linting is now operational for `FortranFixedForm`
2517
([#258](https://github.com/krvajal/vscode-fortran-support/issues/258))
2618

27-
## Changed
19+
### Changed
2820

2921
- Renamed the Fixed Format Format language from `fortran_fixed-form` to
3022
`FortranFixedForm`, an alias has been added for backwards compatibility
@@ -40,11 +32,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
4032

4133
- Removes `paths.js` for detecting binaries in favour of `which`
4234

43-
## [2.3.1]
35+
## [2.4.0]
4436

4537
### Changed
4638

4739
- Changes the syntax highlighting of preprocessor macros to match that of C++
40+
- Changes npm `vscode` module to `@types/vscode` and `@vscode/test-electron`
41+
([#263](https://github.com/krvajal/vscode-fortran-support/issues/263))
4842

4943
### Fixed
5044

@@ -304,9 +298,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
304298

305299
- Initial release
306300

307-
[unreleased]: https://github.com/krvajal/vscode-fortran-support/compare/v2.4.0...HEAD
308-
[2.4.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.3.1...v2.4.0
309-
[2.3.1]: https://github.com/krvajal/vscode-fortran-support/compare/v2.3.0...v2.3.1
301+
[unreleased]: https://github.com/krvajal/vscode-fortran-support/compare/v2.5.0...HEAD
302+
[2.5.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.4.0...v2.5.0
303+
[2.4.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.3.0...v2.4.0
310304
[2.3.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.2.2...v2.3.0
311305
[2.2.2]: https://github.com/krvajal/vscode-fortran-support/compare/2.2.1...v2.2.1
312306
[2.2.1]: https://github.com/krvajal/vscode-fortran-support/compare/2.2.0...v2.2.1

0 commit comments

Comments
 (0)