File tree 2 files changed +11
-6
lines changed
2 files changed +11
-6
lines changed Original file line number Diff line number Diff line change @@ -19,6 +19,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
19
19
- Changed Free and Fixed Form language aliases. ` Fortran ` is now associated with ` FortranFreeForm `
20
20
([ #536 ] ( https://github.com/fortran-lang/vscode-fortran-support/issues/536 ) )
21
21
22
+ ### Fixed
23
+
24
+ - Fixed ` linter.modOutput ` not working with Intel Fortran Compilers
25
+ ([ #538 ] ( https://github.com/fortran-lang/vscode-fortran-support/issues/538 ) )
26
+
22
27
## [ 3.1.0]
23
28
24
29
### Changed
Original file line number Diff line number Diff line change @@ -122,7 +122,7 @@ export class FortranLintingProvider {
122
122
const args = [
123
123
...this . getMandatoryLinterArgs ( this . compiler ) ,
124
124
...this . getLinterExtraArgs ( this . compiler ) ,
125
- this . getModOutputDir ( this . compiler ) ,
125
+ ... this . getModOutputDir ( this . compiler ) ,
126
126
] ;
127
127
const includePaths = this . getIncludePaths ( ) ;
128
128
@@ -138,25 +138,25 @@ export class FortranLintingProvider {
138
138
return argList . map ( arg => arg . trim ( ) ) . filter ( arg => arg !== '' ) ;
139
139
}
140
140
141
- private getModOutputDir ( compiler : string ) : string {
141
+ private getModOutputDir ( compiler : string ) : string [ ] {
142
142
const config = vscode . workspace . getConfiguration ( 'fortran' ) ;
143
143
let modout : string = config . get ( 'linter.modOutput' , '' ) ;
144
144
let modFlag = '-J' ;
145
145
switch ( compiler ) {
146
146
case 'ifx' :
147
147
case 'ifort' :
148
- modFlag = '-module ' ;
148
+ modFlag = '-module' ;
149
149
break ;
150
150
151
151
default :
152
152
modFlag = '-J' ;
153
153
break ;
154
154
}
155
155
if ( modout ) {
156
- modout = modFlag + resolveVariables ( modout ) ;
157
- this . logger . logInfo ( `Linter.moduleOutput: ${ modout } ` ) ;
156
+ modout = resolveVariables ( modout ) ;
157
+ this . logger . logInfo ( `Linter.moduleOutput: ${ modFlag } ${ modout } ` ) ;
158
158
}
159
- return modout ;
159
+ return [ modFlag , modout ] ;
160
160
}
161
161
162
162
/**
You can’t perform that action at this time.
0 commit comments