[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/phps-mode ec71e15 074/405: Fixed bug where token-number
From: |
Stefan Monnier |
Subject: |
[elpa] externals/phps-mode ec71e15 074/405: Fixed bug where token-numbers are not defined |
Date: |
Sat, 13 Jul 2019 09:59:46 -0400 (EDT) |
branch: externals/phps-mode
commit ec71e150c7a973510febe2794c93ecf430561025
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>
Fixed bug where token-numbers are not defined
---
phps-functions.el | 4 +++-
sample-php-files/class.php | 12 ++++++++++++
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/phps-functions.el b/phps-functions.el
index c792c0a..4020428 100644
--- a/phps-functions.el
+++ b/phps-functions.el
@@ -66,7 +66,9 @@
;; When bracket count at start is larger than bracket count at end
(when (and
(boundp 'phps-mode/lexer-tokens)
- (> indent-start indent-end))
+ (> indent-start indent-end)
+ start-token-number
+ end-token-number)
(let ((token-number start-token-number)
(valid-tokens t)
(last-token-is-open-brace nil)
diff --git a/sample-php-files/class.php b/sample-php-files/class.php
index 730480e..891b7e7 100644
--- a/sample-php-files/class.php
+++ b/sample-php-files/class.php
@@ -25,6 +25,18 @@ class MyClass
if (!empty($this->var)) {
$this->var = '';
}
+ if (empty(
+ $this->var
+ )) {
+ $this->var = 'abc';
+ }
+ if (empty(
+ $this->var
+ ) && !empty($this->var)
+ ) {
+ $this->var = 'abc123';
+ }
+
$this->var = 'abc';
$this->var = '\\';
}
- [elpa] externals/phps-mode 09daec3 052/405: Foundation for incremental lexer and syntax colorer completed, (continued)
- [elpa] externals/phps-mode 09daec3 052/405: Foundation for incremental lexer and syntax colorer completed, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 3f4c344 056/405: Fixed detection of doc comment blocks, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 3824abf 060/405: Resolved indent with trailing parenthesis, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode a61cb8b 062/405: Fixed issue with doc comment indentation, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 6c597fb 065/405: Updated readme, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 0ca9fe8 058/405: Detection of point inside doc comment block improved, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 67f9a7a 057/405: Moved lexer-get-point-data to functions, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 27cd705 069/405: Updated readme, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 58300fd 070/405: More updates of readme, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 86ec35f 066/405: Incremental lexer working somewhat, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode ec71e15 074/405: Fixed bug where token-numbers are not defined,
Stefan Monnier <=
- [elpa] externals/phps-mode 236f05e 071/405: Updated makefile to not use hard-coded path to emacs, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode bf633d2 061/405: Added test for indent of final line of doc comment block, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode ba8165a 063/405: Fixed bug with brace count not including braces inside double quoted strings, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 99dfc68 067/405: Incremental-lexer deletes affected overlays, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 90d059c 064/405: Fixed bug in incremental lexer logic, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 1be9270 068/405: Updated README, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e57f1e1 075/405: Skipping indentation if it's already correct, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode c57fb5b 073/405: Improved indentation of trailing opening brace, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 5e30a65 076/405: Added TODO items, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 94d4814 078/405: Added test for moving lexer tokens, Stefan Monnier, 2019/07/13