branch: externals/phps-mode
commit f7f931a5049f4284d28185e36d5faa8113867d16
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Added another failing indentation test
---
phps-mode.el | 2 +-
phps-test-functions.el | 14 +++++++++-----
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/phps-mode.el b/phps-mode.el
index cc4a714..58eec94 100644
--- a/phps-mode.el
+++ b/phps-mode.el
@@ -60,7 +60,7 @@
(defvar phps-mode/use-psr-2 t
"Whether to use PSR-2 guidelines for white-space or not.")
-(defvar phps-mode/idle-interval 1
+(defvar phps-mode/idle-interval 0.2
"Idle seconds before running incremental lexer.")
(define-derived-mode phps-mode prog-mode "PHPs"
diff --git a/phps-test-functions.el b/phps-test-functions.el
index f9974a6..523641f 100644
--- a/phps-test-functions.el
+++ b/phps-test-functions.el
@@ -162,11 +162,18 @@
(should (equal buffer-contents "<?php\nif (myFirstCondition()) {\n
$this->var = 'abc123';\n} else if (mySeconCondition()) {\n $this->var =
'def456';\n}\n"))))
(phps-mode/with-test-buffer
- "<?php\nmyFunction(\n array(\n 'random' => 'abc',\n ),\n
$var2\n);\n"
+ "<?php\nif (myRandomCondition()):\necho 'Something here';\n echo
'Something else here';\nendif;\n"
+ (goto-char 40)
+ (phps-mode/indent-line)
+ (let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
+ (should (equal buffer-contents "<?php\nif (myRandomCondition()):\n
echo 'Something here';\n echo 'Something else here';\nendif;\n"))))
+
+ (phps-mode/with-test-buffer
+ "<?php\nmyFunction(\n array(\n 'random' => 'abc',\n ),\n
$var2\n);\n"
(goto-char 50)
(phps-mode/indent-line)
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
- (should (equal buffer-contents "<?php\nmyFunction(\n array(\n
'random' => 'abc',\n ),\n $var2\n);\n"))))
+ (should (equal buffer-contents "<?php\nmyFunction(\n array(\n
'random' => 'abc',\n ),\n $var2\n);\n"))))
(phps-mode/with-test-buffer
"<?php\n$var = $var2->getHead()\n->getTail();\n"
@@ -196,9 +203,6 @@
(let ((buffer-contents (buffer-substring-no-properties (point-min)
(point-max))))
(should (equal buffer-contents "<?php\nif (empty($this->var)):\n
$this->var = 'abc123';\n endif;"))))
-
-
-
)
(defun phps-mode/test-functions--get-point-data ()
