X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/PHPCodeReader.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/PHPCodeReader.java index 41db8c4..311aa59 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/PHPCodeReader.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/PHPCodeReader.java @@ -7,11 +7,11 @@ package net.sourceforge.phpdt.internal.ui.text; import java.io.IOException; +import net.sourceforge.phpdt.internal.corext.phpdoc.SingleCharReader; + import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.IDocument; -import net.sourceforge.phpdt.internal.corext.phpdoc.SingleCharReader; - /** * Reads from a document either forwards or backwards. May be configured to * skip comments and strings. @@ -119,6 +119,15 @@ public class PHPCodeReader extends SingleCharReader { char current= fDocument.getChar(fOffset++); switch (current) { + case '#': + + if (fSkipComments && fOffset < fEnd) { + gotoLineEnd(); + continue; + } + + return current; + case '/': if (fSkipComments && fOffset < fEnd) { @@ -166,6 +175,10 @@ public class PHPCodeReader extends SingleCharReader { fOffset= offset; return; } + if (current == '#' && fCachedLineOffset <= offset) { + fOffset= offset; + return; + } } } }