Some more code cleanup

Since the grammar can only ever be a single value, it made no sense to
have multiple if statements allowing for that case.

Author: Arcanemagus

lib/main.js

@@ -63,46 +63,52 @@ export default {
       scope: 'file',
       lintOnFly: false,
       grammarScopes: ['source.c', 'source.cpp', 'source.objc', 'source.objcpp'],
-      lint: (activeEditor) => {
+      lint: (editor) => {
         if (helpers === null) {
           helpers = require('atom-linter');
         }
         if (clangFlags === null) {
           clangFlags = require('clang-flags');
         }
 
-        const filePath = activeEditor.getPath();
+        const filePath = editor.getPath();
+
         const args = [
           '-fsyntax-only',
           '-fno-caret-diagnostics',
           '-fno-diagnostics-fixit-info',
           '-fdiagnostics-print-source-range-info',
           '-fexceptions',
+          `-ferror-limit=${this.clangErrorLimit}`,
         ];
 
-        const grammar = activeEditor.getGrammar().name;
+        const grammar = editor.getGrammar().name;
 
-        if (/^C\+\+/.test(grammar)) {
-          args.push('-xc++');
-          args.push(...this.clangDefaultCppFlags.split(/\s+/));
-        }
-        if (grammar === 'Objective-C++') {
-          args.push('-xobjective-c++');
-          args.push(...this.clangDefaultObjCppFlags.split(/\s+/));
-        }
-        if (grammar === 'C') {
-          args.push('-xc');
-          args.push(...this.clangDefaultCFlags.split(/\s+/));
-        }
-        if (grammar === 'Objective-C') {
-          args.push('-xobjective-c');
-          args.push(...this.clangDefaultObjCFlags.split(/\s+/));
+        switch (grammar) {
+          case 'Objective-C++':
+            args.push('-xobjective-c++');
+            args.push(...this.clangDefaultObjCppFlags.split(/\s+/));
+            break;
+          case 'C':
+            args.push('-xc');
+            args.push(...this.clangDefaultCFlags.split(/\s+/));
+            break;
+          case 'Objective-C':
+            args.push('-xobjective-c');
+            args.push(...this.clangDefaultObjCFlags.split(/\s+/));
+            break;
+          default:
+          case 'C++':
+          case 'C++14':
+            args.push('-xc++');
+            args.push(...this.clangDefaultCppFlags.split(/\s+/));
+            break;
         }
 
-        args.push(`-ferror-limit=${this.clangErrorLimit}`);
         if (this.clangSuppressWarnings) {
           args.push('-w');
         }
+
         if (atom.inDevMode()) {
           args.push('--verbose');
         }
@@ -122,6 +128,7 @@ export default {
             console.log(error);
           }
         }
+
         args.push(filePath);
 
         const execOpts = {