Merge pull request #169 from AtomLinter/arcanemagus/only-modify-php

Only modify PHP files

Author: Arcanemagus

lib/index.js

@@ -12,6 +12,8 @@ let generateRange;
 let tinyPromisify;
 let stripJSONComments;
 
+const phpEmbeddedScope = 'text.html.php';
+
 const getConfig = async (filePath) => {
   const readFile = tinyPromisify(fsReadFile);
   const configPath = await findAsync(dirname(filePath), '.htmlhintrc');
@@ -25,6 +27,17 @@ const getConfig = async (filePath) => {
   return null;
 };
 
+const phpScopedEditor = editor => editor.getCursors().some(cursor =>
+  cursor.getScopeDescriptor().getScopesArray().some(scope =>
+    scope === phpEmbeddedScope));
+
+const removePHP = str => str.replace(/<\?(?:php|=)?(?:[\s\S])+?\?>/gi, (match) => {
+  const newlines = match.match(/\r?\n|\r/g);
+  const newlineCount = newlines ? newlines.length : 0;
+
+  return '\n'.repeat(newlineCount);
+});
+
 const loadDeps = () => {
   if (loadDeps.loaded) {
     return;
@@ -98,16 +111,11 @@ export default {
           return null;
         }
 
-        const removePHP = str => str.replace(/<\?(?:php|=)?(?:[\s\S])+?\?>/gi, (match) => {
-          const newlines = match.match(/\r?\n|\r/g);
-          const newlineCount = newlines ? newlines.length : 0;
-
-          return '\n'.repeat(newlineCount);
-        });
+        const isPhPEditor = phpScopedEditor(editor);
 
         const fileText = editor.getText();
-        const fileTextStripped = removePHP(fileText);
-        if (!fileTextStripped) {
+        const text = isPhPEditor ? removePHP(fileText) : fileText;
+        if (!text) {
           return [];
         }
 
@@ -116,7 +124,7 @@ export default {
 
         const ruleset = await getConfig(filePath);
 
-        const messages = HTMLHint.verify(fileTextStripped, ruleset || undefined);
+        const messages = HTMLHint.verify(text, ruleset || undefined);
 
         if (editor.getText() !== fileText) {
           // Editor contents have changed, tell Linter not to update