Renames fortran_fixed-form to FortranFixedForm

Fixes Rename fortran_fixed-form to FortranFixedForm #259

Author: gnikit

package.json

@@ -73,11 +73,12 @@
         "configuration": "./language-configuration.json"
       },
       {
-        "id": "fortran_fixed-form",
+        "id": "FortranFixedForm",
         "aliases": [
           "Fortran",
           "fortran",
-          "FORTRAN77"
+          "FORTRAN77",
+          "fortran_fixed-form"
         ],
         "extensions": [
           ".f",
@@ -111,7 +112,7 @@
         ]
       },
       {
-        "language": "fortran_fixed-form",
+        "language": "FortranFixedForm",
         "scopeName": "source.fortran.fixed",
         "path": "./syntaxes/fortran_fixed-form.tmLanguage.json"
       }
@@ -222,7 +223,7 @@
         "language": "FortranFreeForm"
       },
       {
-        "language": "fortran_fixed-form"
+        "language": "FortranFixedForm"
       }
     ]
   },

src/extension.ts

@@ -8,7 +8,7 @@ import { FortranCompletionProvider } from './features/completion-provider'
 import { FortranDocumentSymbolProvider } from './features/document-symbol-provider'
 
 import { FortranLangServer } from './lang-server'
-import { FORTRAN_FREE_FORM_ID, EXTENSION_ID, promptForMissingTool } from './lib/helper'
+import { FORTRAN_DOCUMENT_SELECTOR, EXTENSION_ID, promptForMissingTool } from './lib/helper'
 import { LoggingService } from './services/logging-service'
 import * as pkg from '../package.json'
 import { LANG_SERVER_TOOL_ID } from './lib/tools'
@@ -24,15 +24,15 @@ export function activate(context: vscode.ExtensionContext) {
   if (extensionConfig.get('linterEnabled', true)) {
     let linter = new FortranLintingProvider(loggingService)
     linter.activate(context.subscriptions)
-    vscode.languages.registerCodeActionsProvider(FORTRAN_FREE_FORM_ID, linter)
+    vscode.languages.registerCodeActionsProvider(FORTRAN_DOCUMENT_SELECTOR, linter)
   } else {
     loggingService.logInfo('Linter is not enabled')
   }
 
   if (extensionConfig.get('formatter') !== 'Disabled') {
     let disposable: vscode.Disposable =
       vscode.languages.registerDocumentFormattingEditProvider(
-        FORTRAN_FREE_FORM_ID,
+        FORTRAN_DOCUMENT_SELECTOR,
         new FortranFormattingProvider(loggingService)
       );
     context.subscriptions.push(disposable);
@@ -44,7 +44,7 @@ export function activate(context: vscode.ExtensionContext) {
   if (extensionConfig.get('provideCompletion', true)) {
     let completionProvider = new FortranCompletionProvider(loggingService)
     vscode.languages.registerCompletionItemProvider(
-      FORTRAN_FREE_FORM_ID,
+      FORTRAN_DOCUMENT_SELECTOR,
       completionProvider
     )
   } else {
@@ -53,15 +53,15 @@ export function activate(context: vscode.ExtensionContext) {
 
   if (extensionConfig.get('provideHover', true)) {
     let hoverProvider = new FortranHoverProvider(loggingService)
-    vscode.languages.registerHoverProvider(FORTRAN_FREE_FORM_ID, hoverProvider)
+    vscode.languages.registerHoverProvider(FORTRAN_DOCUMENT_SELECTOR, hoverProvider)
   } else {
     loggingService.logInfo('Hover Provider is not enabled')
   }
 
   if (extensionConfig.get('provideSymbols', true)) {
     let symbolProvider = new FortranDocumentSymbolProvider()
     vscode.languages.registerDocumentSymbolProvider(
-      FORTRAN_FREE_FORM_ID,
+      FORTRAN_DOCUMENT_SELECTOR,
       symbolProvider
     )
   } else {

src/lang-server.ts

@@ -6,7 +6,7 @@ import {
 import * as which from 'which'
 import * as vscode from 'vscode'
 import {
-  FORTRAN_FREE_FORM_ID,
+  FORTRAN_DOCUMENT_SELECTOR,
 } from './lib/helper'
 import { LANG_SERVER_TOOL_ID } from './lib/tools'
 
@@ -23,7 +23,7 @@ export class FortranLangServer {
     }
 
     const clientOptions: LanguageClientOptions = {
-      documentSelector: [FORTRAN_FREE_FORM_ID],
+      documentSelector: FORTRAN_DOCUMENT_SELECTOR,
     }
 
     this.c = new LanguageClient(

src/lib/helper.ts

@@ -8,7 +8,10 @@ import { LoggingService } from '../services/logging-service';
 // on the package.json otherwise the extension won't
 // work at all
 export const LANGUAGE_ID = 'FortranFreeForm';
-export const FORTRAN_FREE_FORM_ID = { language: LANGUAGE_ID, scheme: 'file' };
+export const FORTRAN_DOCUMENT_SELECTOR = [
+  { scheme: 'file', language: 'FortranFreeForm' },
+  { scheme: 'file', language: 'FortranFixedForm' }
+];
 export { intrinsics }
 export const EXTENSION_ID = 'fortran';