Skip to content

Commit 055ec3c

Browse files
committed
Addresses review comments
1. Fixes conditional trigger for linting 2. Moves which as a dependency 3. Adds logging output for when parts of the extension are enabled
1 parent 71c9beb commit 055ec3c

File tree

4 files changed

+9
-7
lines changed

4 files changed

+9
-7
lines changed

package-lock.json

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,6 +247,7 @@
247247
]
248248
},
249249
"dependencies": {
250-
"vscode-languageclient": "^7.0.0"
250+
"vscode-languageclient": "^7.0.0",
251+
"which": "^2.0.2"
251252
}
252253
}

src/extension.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ export function activate(context: vscode.ExtensionContext) {
2424
let linter = new FortranLintingProvider(loggingService)
2525
linter.activate(context.subscriptions)
2626
vscode.languages.registerCodeActionsProvider(FORTRAN_DOCUMENT_SELECTOR, linter)
27+
loggingService.logInfo('Linter is enabled')
2728
} else {
2829
loggingService.logInfo('Linter is not enabled')
2930
}
@@ -41,6 +42,7 @@ export function activate(context: vscode.ExtensionContext) {
4142
if (extensionConfig.get('provideHover', true)) {
4243
let hoverProvider = new FortranHoverProvider(loggingService)
4344
vscode.languages.registerHoverProvider(FORTRAN_DOCUMENT_SELECTOR, hoverProvider)
45+
loggingService.logInfo('Hover Provider is enabled')
4446
} else {
4547
loggingService.logInfo('Hover Provider is not enabled')
4648
}
@@ -51,6 +53,7 @@ export function activate(context: vscode.ExtensionContext) {
5153
FORTRAN_DOCUMENT_SELECTOR,
5254
symbolProvider
5355
)
56+
loggingService.logInfo('Symbol Provider is enabled')
5457
} else {
5558
loggingService.logInfo('Symbol Provider is not enabled')
5659
}

src/features/linter-provider.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ export default class FortranLintingProvider {
1818

1919
// Only lint Fortran (free, fixed) format files
2020
if (
21-
FORTRAN_DOCUMENT_SELECTOR.some((element) => { element.language !== textDocument.languageId }) ||
22-
FORTRAN_DOCUMENT_SELECTOR.some((element) => { element.scheme !== textDocument.uri.scheme })
21+
!FORTRAN_DOCUMENT_SELECTOR.some(e => e.scheme === textDocument.uri.scheme) ||
22+
!FORTRAN_DOCUMENT_SELECTOR.some(e => e.language === textDocument.languageId)
2323
) {
2424
return
2525
}
@@ -138,7 +138,7 @@ export default class FortranLintingProvider {
138138
private command: vscode.Disposable
139139

140140
public activate(subscriptions: vscode.Disposable[]) {
141-
this.diagnosticCollection = vscode.languages.createDiagnosticCollection()
141+
this.diagnosticCollection = vscode.languages.createDiagnosticCollection('Fortran')
142142

143143
vscode.workspace.onDidOpenTextDocument(
144144
this.doModernFortranLint,

0 commit comments

Comments
 (0)