Some general code cleanup

Author: Arcanemagus

lib/main.js

@@ -1,11 +1,10 @@
 'use babel';
 
+let helpers = null;
+let clangFlags = null;
+
 export default {
   config: {
-    // It should be noted that I, Kepler, hate these Config names. However these
-    //  are the names in use by many people. Changing them for the sake of clean
-    //  of clean code would cause a mess for our users. Because of this we
-    //  override the titles the editor gives them in the settings pane.
     execPath: {
       type: 'string',
       default: 'clang',
@@ -38,53 +37,51 @@ export default {
       type: 'integer',
       default: 0,
     },
-    verboseDebug: {
-      type: 'boolean',
-      default: false,
-    },
   },
 
   activate() {
     require('atom-package-deps').install('linter-clang');
   },
 
   provideLinter() {
-    const helpers = require('atom-linter');
-    const clangFlags = require('clang-flags');
     const regex = '(?<file>.+):(?<line>\\d+):(?<col>\\d+):({(?<lineStart>\\d+):(?<colStart>\\d+)-(?<lineEnd>\\d+):(?<colEnd>\\d+)}.*:)? (?<type>[\\w \\-]+): (?<message>.*)';
     return {
       name: 'clang',
       grammarScopes: ['source.c', 'source.cpp', 'source.objc', 'source.objcpp'],
       scope: 'file',
       lintOnFly: false,
       lint: (activeEditor) => {
+        if (helpers === null) {
+          helpers = require('atom-linter');
+        }
+        if (clangFlags === null) {
+          clangFlags = require('clang-flags');
+        }
         const command = atom.config.get('linter-clang.execPath');
-        const file = activeEditor.getPath();
-        const args = ['-fsyntax-only',
+        const filePath = activeEditor.getPath();
+        const args = [
+          '-fsyntax-only',
           '-fno-caret-diagnostics',
           '-fno-diagnostics-fixit-info',
           '-fdiagnostics-print-source-range-info',
-          '-fexceptions'];
+          '-fexceptions',
+        ];
 
         const grammar = activeEditor.getGrammar().name;
 
         if (/^C\+\+/.test(grammar)) {
-          // const language = "c++";
           args.push('-xc++');
           args.push(...atom.config.get('linter-clang.clangDefaultCppFlags').split(/\s+/));
         }
         if (grammar === 'Objective-C++') {
-          // const language = "objective-c++";
           args.push('-xobjective-c++');
           args.push(...atom.config.get('linter-clang.clangDefaultObjCppFlags').split(/\s+/));
         }
         if (grammar === 'C') {
-          // const language = "c";
           args.push('-xc');
           args.push(...atom.config.get('linter-clang.clangDefaultCFlags').split(/\s+/));
         }
         if (grammar === 'Objective-C') {
-          // const language = "objective-c";
           args.push('-xobjective-c');
           args.push(...atom.config.get('linter-clang.clangDefaultObjCFlags').split(/\s+/));
         }
@@ -93,7 +90,7 @@ export default {
         if (atom.config.get('linter-clang.clangSuppressWarnings')) {
           args.push('-w');
         }
-        if (atom.config.get('linter-clang.verboseDebug')) {
+        if (atom.inDevMode()) {
           args.push('--verbose');
         }
 
@@ -102,23 +99,23 @@ export default {
         );
 
         try {
-          const flags = clangFlags.getClangFlags(activeEditor.getPath());
+          const flags = clangFlags.getClangFlags(filePath);
           if (flags) {
             args.push(...flags);
           }
         } catch (error) {
-          if (atom.config.get('linter-clang.verboseDebug')) {
+          if (atom.inDevMode()) {
             // eslint-disable-next-line no-console
             console.log(error);
           }
         }
+        args.push(filePath);
 
-        // The file is added to the arguments last.
-        args.push(file);
         const execOpts = {
           stream: 'stderr',
           allowEmptyStderr: true,
         };
+
         return helpers.exec(command, args, execOpts).then(output =>
           helpers.parse(output, regex),
         );