File tree Expand file tree Collapse file tree 3 files changed +10
-9
lines changed Expand file tree Collapse file tree 3 files changed +10
-9
lines changed Original file line number Diff line number Diff line change 628
628
"command" : " fortran.build.debug" ,
629
629
"group" : " navigation@1" ,
630
630
"title" : " Debug Fortran File" ,
631
- "when" : " resourceLangId == fortran && !isInDiffEditor && !virtualWorkspace && shellExecutionSupported"
631
+ "when" : " resourceLangId =~ /Fortran/ && !isInDiffEditor && !virtualWorkspace && shellExecutionSupported"
632
632
}
633
633
]
634
634
}
Original file line number Diff line number Diff line change @@ -296,7 +296,7 @@ export class FortranLintingProvider {
296
296
program : `${ textDocument . fileName } .o` ,
297
297
cwd : folder . uri . fsPath ,
298
298
} ;
299
- await vscode . debug . startDebugging ( folder , selectedConfig , { noDebug : debug } ) ;
299
+ await vscode . debug . startDebugging ( folder , selectedConfig , { noDebug : ! debug } ) ;
300
300
return ;
301
301
} catch ( err ) {
302
302
this . logger . error ( `[build] Compiling ${ textDocument . fileName } failed:` , err ) ;
@@ -417,7 +417,8 @@ export class FortranLintingProvider {
417
417
*/
418
418
private getLinterExtraArgs ( ) : string [ ] {
419
419
const config = vscode . workspace . getConfiguration ( EXTENSION_ID ) ;
420
- let args : string [ ] = this . linter . argsDefault ;
420
+ // Get the linter arguments from the settings via a deep copy
421
+ let args : string [ ] = [ ...this . linter . argsDefault ] ;
421
422
const user_args : string [ ] = this . settings . args ;
422
423
// If we have specified linter.extraArgs then replace default arguments
423
424
if ( user_args . length > 0 ) args = user_args . slice ( ) ;
Original file line number Diff line number Diff line change @@ -14,28 +14,28 @@ abstract class Linter {
14
14
/**
15
15
* Linter name
16
16
*/
17
- public name : string ,
17
+ public readonly name : string ,
18
18
/**
19
19
* Regular expression to match compiler messages
20
20
*/
21
- public regex : RegExp ,
21
+ public readonly regex : RegExp ,
22
22
/**
23
23
* Keywords used to identify message severity
24
24
*/
25
- public severity : LinterSeverityKeywords ,
25
+ public readonly severity : LinterSeverityKeywords ,
26
26
/**
27
27
* Mandatory linter arguments. These are always present
28
28
*/
29
- public args : string [ ] ,
29
+ public readonly args : string [ ] ,
30
30
/**
31
31
* Command line arguments to pass to the linter, these get overwritten in
32
32
* case the user has set arguments in the settings
33
33
*/
34
- public argsDefault ?: string [ ] ,
34
+ public readonly argsDefault ?: string [ ] ,
35
35
/**
36
36
* Compiler flag used to change the directory output for modules
37
37
*/
38
- public modFlag ?: string
38
+ public readonly modFlag ?: string
39
39
) { }
40
40
41
41
public getSeverityLevel ( msg_type : string ) : vscode . DiagnosticSeverity {
You can’t perform that action at this time.
0 commit comments