Linting now works with fixed form

Fixes Linting does not work for fixed format files #258

Author: gnikit

CHANGELOG.md

@@ -10,6 +10,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## Fixed
 
 - Extension now activates for `FortranFixedForm`
+- Linting is now operational for `FortranFixedForm`
 
 ## Changed
 

src/features/linter-provider.ts

@@ -2,23 +2,24 @@
 
 import * as path from 'path'
 import * as cp from 'child_process'
-import { getIncludeParams, LANGUAGE_ID } from '../lib/helper'
+import { FORTRAN_DOCUMENT_SELECTOR, getIncludeParams } from '../lib/helper'
 
 import * as vscode from 'vscode'
 import { LoggingService } from '../services/logging-service'
 
 export default class FortranLintingProvider {
-  constructor(private loggingService: LoggingService) {}
+  constructor(private loggingService: LoggingService) { }
 
   private diagnosticCollection: vscode.DiagnosticCollection
 
   private doModernFortranLint(textDocument: vscode.TextDocument) {
     const errorRegex: RegExp =
       /^([a-zA-Z]:\\)*([^:]*):([0-9]+):([0-9]+):\s+(.*)\s+.*?\s+(Error|Warning|Fatal Error):\s(.*)$/gm
 
+    // Only lint Fortran (free, fixed) format files
     if (
-      textDocument.languageId !== LANGUAGE_ID ||
-      textDocument.uri.scheme !== 'file'
+      FORTRAN_DOCUMENT_SELECTOR.some((element) => { element.language !== textDocument.languageId }) ||
+      FORTRAN_DOCUMENT_SELECTOR.some((element) => { element.scheme !== textDocument.uri.scheme })
     ) {
       return
     }

src/lib/helper.ts

@@ -7,7 +7,6 @@ import { LoggingService } from '../services/logging-service';
 // IMPORTANT: this should match the value
 // on the package.json otherwise the extension won't
 // work at all
-export const LANGUAGE_ID = 'FortranFreeForm';
 export const FORTRAN_DOCUMENT_SELECTOR = [
   { scheme: 'file', language: 'FortranFreeForm' },
   { scheme: 'file', language: 'FortranFixedForm' }