emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/phps-mode 20e77aa 181/405: Removed debug output


From: Stefan Monnier
Subject: [elpa] externals/phps-mode 20e77aa 181/405: Removed debug output
Date: Sat, 13 Jul 2019 10:00:09 -0400 (EDT)

branch: externals/phps-mode
commit 20e77aa07cbcab48d1654371da0aeea215100c05
Author: Christian Johansson <address@hidden>
Commit: Christian Johansson <address@hidden>

    Removed debug output
---
 phps-mode-functions.el      | 8 +-------
 phps-mode-test-functions.el | 4 ++--
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/phps-mode-functions.el b/phps-mode-functions.el
index 9be7cfd..a6cadcf 100644
--- a/phps-mode-functions.el
+++ b/phps-mode-functions.el
@@ -304,12 +304,6 @@ Refactor to this structure:
                 (if (> next-token-start-line-number token-start-line-number)
                     (progn
 
-                      ;; Flag when last token was on a new line
-                      (when (and (= token-number last-token-number)
-                                 (> next-token-start-line-number 
token-start-line-number))
-                        ;; (message "Token %s was first on line and last last 
token" token)
-                        (setq last-token-was-first-on-new-line t))
-
                       ;; Calculate indentation level at end of line
                       (setq nesting-end (+ round-bracket-level 
square-bracket-level curly-bracket-level alternative-control-structure-level 
inline-control-structure-level in-assignment-level in-class-declaration-level))
 
@@ -337,7 +331,7 @@ Refactor to this structure:
                         (when first-token-is-nesting-increase
                           (setq column-level (1+ column-level))))
 
-                      (message "Process line ending.   nesting: %s-%s, 
line-number: %s-%s,     indent: %s.%s,  token: %s" nesting-start nesting-end 
token-start-line-number token-end-line-number column-level tuning-level token)
+                      ;; (message "Process line ending.        nesting: %s-%s, 
line-number: %s-%s,     indent: %s.%s,  token: %s" nesting-start nesting-end 
token-start-line-number token-end-line-number column-level tuning-level token)
                       
                       ;; (message "new line %s or last token at %s, %s %s.%s 
(%s - %s) = %s %s %s %s %s [%s %s] %s %s %s" token-start-line-number token 
next-token column-level tuning-level nesting-start nesting-end 
round-bracket-level square-bracket-level curly-bracket-level 
alternative-control-structure-level inline-control-structure-level 
first-token-is-nesting-decrease first-token-is-nesting-increase in-assignment 
in-assignment-level in-class-declaration-level)
 
diff --git a/phps-mode-test-functions.el b/phps-mode-test-functions.el
index c1defaf..f90e663 100644
--- a/phps-mode-test-functions.el
+++ b/phps-mode-test-functions.el
@@ -186,10 +186,10 @@
    (should (equal '((1 (0 0)) (2 (0 0)) (3 (0 0)) (4 (1 0)) (5 (0 0))) 
(phps-mode-test-functions--hash-to-list 
(phps-mode-functions-get-lines-indent)))))
 
   (phps-mode-test-with-buffer
-   "<?php\n// Can we load configuration?\nif ($configuration::load(\n    
self::getParameter(self::PARAMETER_CONFIGURATION_INTERNAL_FILENAME),\n    
self::getParameter(self::PARAMETER_CONFIGURATION_EXTERNAL_FILENAME),\n    
self::getParameter(self::PARAMETER_STRUCTURE_INTERNAL_FILENAME),\n    
self::getParameter(self::PARAMETER_STRUCTURE_EXTERNAL_FILENAME)\n)) {\n    echo 
'was here';\n}\n"
+   "<?php\n// Can we load configuration?\nif ($configuration::load(\n    
self::getParameter(self::PARAMETER_CONFIGURATION_INTERNAL_FILENAME),\n    
self::getParameter(self::PARAMETER_CONFIGURATION_EXTERNAL_FILENAME),\n    
self::getParameter(self::PARAMETER_STRUCTURE_INTERNAL_FILENAME),\n    
self::getParameter(self::PARAMETER_STRUCTURE_EXTERNAL_FILENAME))\n) {\n    echo 
'was here';\n}\n"
    "If expression spanning multiple lines"
    ;; (message "Tokens: %s" phps-mode-lexer-tokens)
-   (should (equal '((1 (0 0)) (2 (0 0)) (3 (0 0)) (4 (1 0)) (5 (1 0)) (6 (1 
0)) (7 (1 0)) (8 (0 0)) (9 (1 0)) (10 (0 0))) 
(phps-mode-test-functions--hash-to-list 
(phps-mode-functions-get-lines-indent)))))
+   (should (equal '((1 (0 0)) (2 (0 0)) (3 (0 0)) (4 (1 0)) (5 (1 0)) (6 (1 
0)) (7 (0 0)) (8 (0 0)) (9 (1 0)) (10 (0 0))) 
(phps-mode-test-functions--hash-to-list 
(phps-mode-functions-get-lines-indent)))))
 
   )
 



reply via email to

[Prev in Thread] Current Thread [Next in Thread]