Fix indent-line function for statements at bol

jorissteyn · Eric James Michael Ritz · commit eef97db17666 · 2015-02-07T08:15:48.000-05:00
Resolves issue #184 Signed-off-by: Eric James Michael Ritz <ejmr@plutono.com>
diff --git a/php-mode-test.el b/php-mode-test.el
@@ -526,4 +526,14 @@ style from Drupal."
       (call-interactively 'indent-for-tab-command)
       (should (= (current-column) equal-indentation)))))
 
+(ert-deftest php-mode-test-issue-184()
+  "Test indent-line for statements and heredoc end at beginning of lines"
+  (with-php-mode-test ("issue-184.php")
+                      (search-forward "html;")
+                      (php-cautious-indent-line)
+                      (should (eq (current-indentation) 0))
+                      (search-forward "return;")
+                      (php-cautious-indent-line)
+                      (should (eq (current-indentation) c-basic-offset))))
+
 ;;; php-mode-test.el ends here
diff --git a/php-mode.el b/php-mode.el
@@ -829,7 +829,8 @@ example `html-mode'.  Known such libraries are:\n\t"
         (move-beginning-of-line nil)
         ;; Don't indent heredoc end mark
         (save-match-data
-          (unless (looking-at "[a-zA-Z0-9_]+;\n")
+          (unless (and (looking-at "[a-zA-Z0-9_]+;\n")
+                       (php-in-string-p))
             (setq doit t)))
         (goto-char here)
         (when doit
diff --git a/tests/issue-184.php b/tests/issue-184.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * GitHub Issue:    https://github.com/ejmr/php-mode/issues/184
+ *
+ * Test indentation of statements at beginning of line.
+ *
+ * The termination of a heredoc is always fixed bol, but php-mode must
+ * detect that not all statements at column 0 are the end of a
+ * heredoc.
+ */
+
+function test() {
+    $html = <<<html
+<a href="#"></a>
+html;
+
+return;
+}
