From 335084a93c10cc6e4493827882bc0c7368181537 Mon Sep 17 00:00:00 2001 From: khartlage Date: Tue, 1 Apr 2003 19:38:26 +0000 Subject: [PATCH] *** empty log message *** --- .../phpeditor/php/PHPPartitionScanner.java | 15 ++++++++------- 1 files changed, 8 insertions(+), 7 deletions(-) diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartitionScanner.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartitionScanner.java index 92badac..81392ce 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartitionScanner.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpeclipse/phpeditor/php/PHPPartitionScanner.java @@ -6,7 +6,7 @@ * Created on 05.03.2003 * * @author Stefan Langer (musk) - * @version $Revision: 1.11 $ + * @version $Revision: 1.12 $ */ package net.sourceforge.phpeclipse.phpeditor.php; @@ -147,13 +147,13 @@ public class PHPPartitionScanner implements IPartitionTokenScanner != IPHPPartitionScannerConstants.PHP_MULTILINE_COMMENT && checkPattern(new char[] { '?', 'p', 'h', 'p' }, true)) { - if (fContentType != IPHPPartitionScannerConstants.PHP + if (fContentType != IPHPPartitionScannerConstants.PHP && fOffset - 5 > 0) { fOffset -= 5; IToken token = getToken(fContentType); // save previouse contenttype - fPrevContentType = fContentType; + fPrevContentType = fContentType; fContentType = IPHPPartitionScannerConstants.PHP; @@ -194,10 +194,10 @@ public class PHPPartitionScanner implements IPartitionTokenScanner { if ((c = read()) == '>') { // TODO Actually calculate the previouse contenttype from the document - if(fPrevContentType != null) - fContentType = fPrevContentType; - else - fContentType = IPHPPartitionScannerConstants.HTML; + if(fPrevContentType != null) + fContentType = fPrevContentType; + else + fContentType = IPHPPartitionScannerConstants.HTML; partitionBorder = true; return getToken(IPHPPartitionScannerConstants.PHP); } @@ -375,3 +375,4 @@ public class PHPPartitionScanner implements IPartitionTokenScanner } } + -- 1.7.1