Skip to content

Commit 3a6b8e4

Browse files
authored
Merge pull request #823 from fortran-lang:bug/gfortran-4.x.x
bug(lint): adds fix for old GFortra 4.x.x
2 parents 345072f + 3d20cf1 commit 3a6b8e4

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.vscode/settings.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,5 +60,6 @@
6060
// Other Fortran options
6161
"fortran.preferredCase": "lowercase",
6262
// Supress Git pop-up interfering with UI testing
63-
"git.openRepositoryInParentFolders": "always"
63+
"git.openRepositoryInParentFolders": "always",
64+
"mesonbuild.configureOnOpen": false
6465
}

CHANGELOG.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,10 +78,12 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
7878

7979
### Fixed
8080

81+
- Fixed linter REGEX for GFortran 4.x.x
82+
([#813](https://github.com/fortran-lang/vscode-fortran-support/issues/813))
8183
- Fixed GFortran version regex to allow for semver + build metadata
8284
([#813](https://github.com/fortran-lang/vscode-fortran-support/issues/813))
8385
- Fixed broken badges and replaced them with shields.io
84-
([[#815](https://github.com/fortran-lang/vscode-fortran-support/issues/815)])
86+
([#815](https://github.com/fortran-lang/vscode-fortran-support/issues/815))
8587
- Fixed regular expression for parsing version of GFortran in linter
8688
([#759](https://github.com/fortran-lang/vscode-fortran-support/issues/759))
8789
- Fixed bug where diagnostic messages would linger from the previous state

src/lib/linters.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ export class GNULinter extends Linter {
5353
constructor() {
5454
super(
5555
'gfortran',
56-
/(?:^(?<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,
56+
/(?:^(?<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,
5757
{
5858
errors: ['error', 'fatal error'],
5959
warnings: ['warning'],

0 commit comments

Comments
 (0)