Merge branch 'master' into dev

Author: gnikit

CHANGELOG.md

@@ -31,6 +31,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 - Adds native support for the fortran-language-server (`fortls`) making
   unnecessary the usage of Fortran Intellisense extension
   ([#290](https://github.com/krvajal/vscode-fortran-support/issues/290))
+## [2.6.2]
+
+### Added
+
+- Adds Don't Show Again option when failing to spawn `fortls`, Fortran Intellisense
+  pop-up has already been removed
+  ([#303](https://github.com/krvajal/vscode-fortran-support/issues/303))
 
 ## [2.6.1]
 
@@ -361,7 +368,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 - Initial release
 
-[unreleased]: https://github.com/krvajal/vscode-fortran-support/compare/v2.6.1...HEAD
+[unreleased]: https://github.com/krvajal/vscode-fortran-support/compare/v3.0....HEAD
+[3.0.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.6.2...v3.0.0
+[2.6.2]: https://github.com/krvajal/vscode-fortran-support/compare/v2.6.1...v2.6.2
 [2.6.1]: https://github.com/krvajal/vscode-fortran-support/compare/v2.6.0...v2.6.1
 [2.6.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.5.0...v2.6.0
 [2.5.0]: https://github.com/krvajal/vscode-fortran-support/compare/v2.4.3...v2.5.0

package.json

@@ -278,6 +278,11 @@
           ],
           "description": "Specify the word case to use when suggesting autocomplete options."
         },
+        "fortran.ignoreWarning.fortls": {
+          "type": "boolean",
+          "default": false,
+          "description": "Hide error message when the fortran-language-server is not detected"
+        },
         "fortran.includePaths": {
           "deprecationMessage": "fortran.includePaths has been renamed to fortran.linter.includePaths."
         },

src/extension.ts

@@ -66,19 +66,30 @@ export async function activate(context: vscode.ExtensionContext) {
   // Not the most elegant solution but we need pip install to have finished
   // before the activate function is called so we do a little code duplication
   which(config.get<string>('fortls.path'), err => {
-    if (err) {
-      const msg = `It is highly recommended to use the fortran-language-server to
+    if (!config.get('ignoreWarning.fortls')) {
+      if (err) {
+        const msg = `It is highly recommended to use the fortran-language-server to
               enable IDE features like hover, peeking, gotos and many more.
               For a full list of features the language server adds see:
               https://github.com/hansec/fortran-language-server`;
-      promptForMissingTool(LANG_SERVER_TOOL_ID, msg, 'Python', loggingService).then(() => {
+        promptForMissingTool(
+          LANG_SERVER_TOOL_ID,
+          msg,
+          'Python',
+          ['Install', "Don't Show Again"],
+          loggingService,
+          () => {
+            config.update('ignoreWarning.fortls', true);
+          }
+        ).then(() => {
+          const fortls = new FortranLanguageServer(loggingService);
+          fortls.activate(context.subscriptions);
+        });
+      } else {
+        // Spawn the fortran-language-server
         const fortls = new FortranLanguageServer(loggingService);
         fortls.activate(context.subscriptions);
-      });
-    } else {
-      // Spawn the fortran-language-server
-      const fortls = new FortranLanguageServer(loggingService);
-      fortls.activate(context.subscriptions);
+      }
     }
   });
 }

src/features/formatting-provider.ts

@@ -51,7 +51,7 @@ export class FortranFormattingProvider implements vscode.DocumentFormattingEditP
       this.logger.logWarning(`Formatter: ${formatterName} not detected in your system.
                                 Attempting to install now.`);
       const msg = `Installing ${formatterName} through pip with --user option`;
-      promptForMissingTool(formatterName, msg, 'Python');
+      promptForMissingTool(formatterName, msg, 'Python', ['Install'], this.logger);
     }
 
     const args: string[] = [document.fileName, ...this.getFormatterArgs()];
@@ -90,7 +90,7 @@ export class FortranFormattingProvider implements vscode.DocumentFormattingEditP
       this.logger.logWarning(`Formatter: ${formatterName} not detected in your system.
                                     Attempting to install now.`);
       const msg = `Installing ${formatterName} through pip with --user option`;
-      promptForMissingTool(formatterName, msg, 'Python');
+      promptForMissingTool(formatterName, msg, 'Python', ['Install'], this.logger);
     }
 
     // Annoyingly findent only outputs to a file and not to a stream so

src/lib/tools.ts

@@ -47,40 +47,43 @@ export function FortranDocumentSelector(folder?: vscode.WorkspaceFolder) {
  * e.g 'hansec.fortran-ls'
  *
  * @param tool name of the tool e.g. fortran-language-server
- * @param msg optional message for installing said package
+ * @param msg message for installing said package
  * @param toolType type of tool, supports `Python` (through pip) and 'VSExt'
+ * @param opts options for the prompt. "Install" and "Don't Show Again" are coded
+ * @param logger log channel output
+ * @param action a void function for an action to perform when "Don't Show Again" is pressed
  */
 export async function promptForMissingTool(
   tool: string,
   msg: string,
   toolType: string,
-  logger?: LoggingService
+  opts: string[],
+  logger?: LoggingService,
+  action?: () => void
 ) {
   const items = ['Install'];
-  return new Promise((resolve, reject) => {
-    return resolve(
-      vscode.window.showInformationMessage(msg, ...items).then(selected => {
-        if (selected === 'Install') {
-          switch (toolType) {
-            case 'Python':
-              installPythonTool(tool, logger);
-              break;
+  return vscode.window.showInformationMessage(msg, ...opts).then(selected => {
+    if (selected === 'Install') {
+      switch (toolType) {
+        case 'Python':
+          installPythonTool(tool, logger);
+          break;
 
-            case 'VSExt':
-              logger.logInfo(`Installing VS Marketplace Extension with id: ${tool}`);
-              vscode.commands.executeCommand('extension.open', tool);
-              vscode.commands.executeCommand('workbench.extensions.installExtension', tool);
-              logger.logInfo(`Extension ${tool} successfully installed`);
-              break;
+        case 'VSExt':
+          logger.logInfo(`Installing VS Marketplace Extension with id: ${tool}`);
+          vscode.commands.executeCommand('extension.open', tool);
+          vscode.commands.executeCommand('workbench.extensions.installExtension', tool);
+          logger.logInfo(`Extension ${tool} successfully installed`);
+          break;
 
-            default:
-              logger.logError(`Failed to install tool: ${tool}`);
-              vscode.window.showErrorMessage(`Failed to install tool: ${tool}`);
-              break;
-          }
-        }
-      })
-    );
+        default:
+          logger.logError(`Failed to install tool: ${tool}`);
+          vscode.window.showErrorMessage(`Failed to install tool: ${tool}`);
+          break;
+      }
+    } else if (selected === "Don't Show Again") {
+      action();
+    }
   });
 }