Merge pull request #198 from AtomLinter/arcanemagus/handle-clang-complete

If using .clang-complete disable for modified files

Author: Arcanemagus

lib/main.js

@@ -214,10 +214,12 @@ export default {
           args.push(`-I${path}`),
         );
 
+        let usingClangComplete = false;
         try {
           const flags = clangFlags.getClangFlags(filePath);
-          if (flags) {
+          if (flags.length > 0) {
             args.push(...flags);
+            usingClangComplete = true;
           }
         } catch (error) {
           if (atom.inDevMode()) {
@@ -226,15 +228,25 @@ export default {
           }
         }
 
-        args.push('-');
+        if (editor.isModified() && usingClangComplete) {
+          // If the user has a .clang-complete file we can't lint current
+          // TextEditor contents, return null so nothing gets modified
+          return null;
+        }
 
         const execOpts = {
-          stdin: fileText,
           stream: 'stderr',
           allowEmptyStderr: true,
-          cwd: fileDir,
         };
 
+        if (usingClangComplete) {
+          args.push(filePath);
+        } else {
+          args.push('-');
+          execOpts.stdin = fileText;
+          execOpts.cwd = fileDir;
+        }
+
         const output = await helpers.exec(this.executablePath, args, execOpts);
 
         if (editor.getText() !== fileText) {