[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/phps-mode da1d1de 051/405: Temporary lexer after change
From: |
Stefan Monnier |
Subject: |
[elpa] externals/phps-mode da1d1de 051/405: Temporary lexer after change until other work is ready |
Date: |
Sat, 13 Jul 2019 09:59:41 -0400 (EDT) |
branch: externals/phps-mode
commit da1d1de15d3652fdfda30380cfcd7bd7ebf4c76c
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>
Temporary lexer after change until other work is ready
---
phps-functions.el | 3 ++-
phps-lexer.el | 7 +++++--
sample-php-files/class.php | 3 ---
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/phps-functions.el b/phps-functions.el
index 2ca33aa..a7b795b 100644
--- a/phps-functions.el
+++ b/phps-functions.el
@@ -91,7 +91,8 @@
;; (message "Tokens was valid, decreasing indent %s - %s"
(line-beginning-position) (line-end-position))
(setq indent-level (- indent-level (- indent-start
indent-end))))))
;; (message "inside scripting, start: %s, end: %s, indenting to
column %s " start end indent-level)
- (indent-line-to (* indent-level tab-width)))))))))
+ (indent-line-to (* indent-level tab-width))
+ (phps-mode/run-incremental-lex))))))))
;; TODO Implement this
(defun phps-mode/indent-region ()
diff --git a/phps-lexer.el b/phps-lexer.el
index 78919e3..123a3cb 100644
--- a/phps-lexer.el
+++ b/phps-lexer.el
@@ -1331,8 +1331,10 @@ ANY_CHAR'
(when (and (eq start 1)
end)
;; (message "SETUP %s %s" start end)
+ (delete-all-overlays)
(when (boundp 'phps-mode/buffer-changes--start)
(setq phps-mode/buffer-changes--start nil))
+
(phps-mode/BEGIN phps-mode/ST_INITIAL)))
(defun phps-mode/lex--RUN ()
@@ -1343,8 +1345,9 @@ ANY_CHAR'
(defun phps-mode/run-incremental-lex ()
"Run incremental lexer based on `phps-mode/buffer-changes--start'."
(when (boundp 'phps-mode/buffer-changes--start)
- (message "Should run incremental lex here %s - %s"
phps-mode/buffer-changes--start (point-max))
- (semantic-lex phps-mode/buffer-changes--start (point-max))
+ (semantic-lex-buffer)
+ ;; TODO (message "Should run incremental lex here %s - %s"
phps-mode/buffer-changes--start (point-max))
+ ;; TODO (semantic-lex phps-mode/buffer-changes--start (point-max))
(setq phps-mode/buffer-changes--start nil)))
(define-lex phps-mode/tags-lexer
diff --git a/sample-php-files/class.php b/sample-php-files/class.php
index c7ac743..e980006 100644
--- a/sample-php-files/class.php
+++ b/sample-php-files/class.php
@@ -15,9 +15,6 @@ class MyClass
public function myMethod()
{
echo "Some stuff here"; // Just a comment
- if ($this->var) {
-
- }
}
public function myMethod2() {
- [elpa] externals/phps-mode b437374 040/405: Fixed bug in parsing of object parameters inside double quoted string, (continued)
- [elpa] externals/phps-mode b437374 040/405: Fixed bug in parsing of object parameters inside double quoted string, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 7161184 041/405: Handles stacked states better, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode c625217 042/405: Added flag for PSR-2 white-space settings, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode b629c4b 050/405: Updated comments and TODOs, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 4b4a375 043/405: Using lexical bindings for all files, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode c040358 046/405: Point lexer token information makes more sense, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 94492c4 048/405: Added changes tracking to functions from lexer, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode be46d9c 044/405: Added lexer autoload to functions, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode a259292 047/405: Changed indentation function to work solely on tokens, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 4098f46 049/405: Started with incremental lexer, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode da1d1de 051/405: Temporary lexer after change until other work is ready,
Stefan Monnier <=
- [elpa] externals/phps-mode 990d3dd 054/405: Added test for indentation of multiple-line doc comment, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode dd80d27 055/405: Started work on detecting doc comment blocks, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode e1b7160 053/405: (newline-and-indent) now working, Stefan Monnier, 2019/07/13
- [elpa] externals/phps-mode 8aa1ab6 059/405: Another test for getting point data inside doc block, Stefan Monnier, 2019/07/13
- [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