Skip to content

Commit

Permalink
Merge pull request #823 from fortran-lang:bug/gfortran-4.x.x
Browse files Browse the repository at this point in the history
bug(lint): adds fix for old GFortra 4.x.x
  • Loading branch information
gnikit authored Feb 5, 2023
2 parents 345072f + 3d20cf1 commit 3a6b8e4
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,5 +60,6 @@
// Other Fortran options
"fortran.preferredCase": "lowercase",
// Supress Git pop-up interfering with UI testing
"git.openRepositoryInParentFolders": "always"
"git.openRepositoryInParentFolders": "always",
"mesonbuild.configureOnOpen": false
}
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).

### Fixed

- Fixed linter REGEX for GFortran 4.x.x
([#813](https://github.com/fortran-lang/vscode-fortran-support/issues/813))
- Fixed GFortran version regex to allow for semver + build metadata
([#813](https://github.com/fortran-lang/vscode-fortran-support/issues/813))
- Fixed broken badges and replaced them with shields.io
([[#815](https://github.com/fortran-lang/vscode-fortran-support/issues/815)])
([#815](https://github.com/fortran-lang/vscode-fortran-support/issues/815))
- Fixed regular expression for parsing version of GFortran in linter
([#759](https://github.com/fortran-lang/vscode-fortran-support/issues/759))
- Fixed bug where diagnostic messages would linger from the previous state
Expand Down
2 changes: 1 addition & 1 deletion src/lib/linters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ export class GNULinter extends Linter {
constructor() {
super(
'gfortran',
/(?:^(?<fname>(?:\w:\\)?.*):(?<ln>\d+):(?<cn>\d+):(?:\s+.*\s+.*?\s+)(?<sev1>Error|Warning|Fatal Error):\s(?<msg1>.*)$)|(?:^(?<bin>\w+):\s*(?<sev2>\w+\s*\w*):\s*(?<msg2>.*)$)/gm,
/(?:^(?<fname>(?:\w:\\)?.*):(?<ln>\d+):(?<cn>\d+)[:.](?:\s+.*\s+.*?\s+)(?<sev1>Error|Warning|Fatal Error):\s(?<msg1>.*)$)|(?:^(?<bin>\w+):\s*(?<sev2>\w+\s*\w*):\s*(?<msg2>.*)$)/gm,
{
errors: ['error', 'fatal error'],
warnings: ['warning'],
Expand Down

0 comments on commit 3a6b8e4

Please sign in to comment.