From: axelcl <axelcl>
Date: Wed, 10 Nov 2004 20:06:25 +0000 (+0000)
Subject: don't split one line PHP statements in CodeFormatter
X-Git-Url: http://git.phpeclipse.com

don't split one line PHP statements in CodeFormatter
---

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
index bfb0e3b..7caa523 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/formatter/CodeFormatter.java
@@ -168,6 +168,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     , true, /* tokenizeStrings */
     null, null); // regular scanner for forming lines
     scanner.recordLineSeparator = true;
+    scanner.ignorePHPOneLiner = true;
     // to remind of the position of the beginning of the line.
     splitScanner = new Scanner(true /* comment */
     , true /* whitespace */
@@ -175,6 +176,7 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
     , false /* assert */
     , true, /* tokenizeStrings */
     null, null);
+    splitScanner.ignorePHPOneLiner = true;
     // secondary scanner to split long lines formed by primary scanning
     // initialize current line buffer
     currentLineBuffer = new StringBuffer();
@@ -383,6 +385,10 @@ public class CodeFormatter implements ITerminalSymbols, ICodeFormatter {
             newLineCount = 0;
           }
           outputCurrentTokenWithoutIndent(Scanner.TokenNameINLINE_HTML, newLineCount);
+          int srcLen = scanner.source.length;
+          if (scanner.currentPosition < srcLen-1) {
+            newLine(1);
+          }
           continue;
         }
         /*