X-Git-Url: http://git.phpeclipse.com

diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/PHPPairMatcher.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/PHPPairMatcher.java
index 97a0edd..ab9abd5 100644
--- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/PHPPairMatcher.java
+++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/PHPPairMatcher.java
@@ -11,114 +11,127 @@ import org.eclipse.jface.text.BadLocationException;
 import org.eclipse.jface.text.IDocument;
 import org.eclipse.jface.text.IRegion;
 import org.eclipse.jface.text.Region;
+import org.eclipse.jface.text.source.ICharacterPairMatcher;
 
 /**
  * Helper class for match pairs of characters.
  */
-public class PHPPairMatcher {
-	
-	
-	public static final int LEFT=	   1;
-	public static final int RIGHT= 2;
-
-	
+public class PHPPairMatcher implements ICharacterPairMatcher {
 	protected char[] fPairs;
+
 	protected IDocument fDocument;
+
 	protected int fOffset;
-	
+
 	protected int fStartPos;
+
 	protected int fEndPos;
+
 	protected int fAnchor;
-	
-	protected PHPCodeReader fReader= new PHPCodeReader();
-	
-	
+
+	protected PHPCodeReader fReader = new PHPCodeReader();
+
 	public PHPPairMatcher(char[] pairs) {
-		fPairs= pairs;
+		fPairs = pairs;
+	}
+
+	/*
+	 * @see org.eclipse.jface.text.source.ICharacterPairMatcher#clear()
+	 */
+	public void clear() {
+		if (fReader != null) {
+			try {
+				fReader.close();
+			} catch (IOException x) {
+				// ignore
+			}
+		}
 	}
-	
+
 	public IRegion match(IDocument document, int offset) {
 
-		fOffset= offset;
+		fOffset = offset;
 
 		if (fOffset < 0)
 			return null;
 
-		fDocument= document;
+		fDocument = document;
 
 		if (matchPairsAt() && fStartPos != fEndPos)
 			return new Region(fStartPos, fEndPos - fStartPos + 1);
-			
+
 		return null;
 	}
-	
+
 	public int getAnchor() {
 		return fAnchor;
 	}
-	
+
 	public void dispose() {
-		fDocument= null;
+		fDocument = null;
 		if (fReader != null) {
 			try {
 				fReader.close();
 			} catch (IOException x) {
 				// ignore
 			}
-			fReader= null;
+			fReader = null;
 		}
 	}
-	
+
 	protected boolean matchPairsAt() {
 
 		int i;
-		int pairIndex1= fPairs.length;
-		int pairIndex2= fPairs.length;
+		int pairIndex1 = fPairs.length;
+		int pairIndex2 = fPairs.length;
 
-		fStartPos= -1;
-		fEndPos= -1;
+		fStartPos = -1;
+		fEndPos = -1;
 
 		// get the chars preceding and following the start position
 		try {
 
-			char prevChar= fDocument.getChar(Math.max(fOffset - 1, 0));
-			char nextChar= fDocument.getChar(fOffset);
+			char prevChar = fDocument.getChar(Math.max(fOffset - 1, 0));
+			char nextChar = fDocument.getChar(fOffset);
 
 			// search for opening peer character next to the activation point
-			for (i= 0; i < fPairs.length; i= i + 2) {
+			for (i = 0; i < fPairs.length; i = i + 2) {
 				if (nextChar == fPairs[i]) {
-					fStartPos= fOffset;
-					pairIndex1= i;
+					fStartPos = fOffset;
+					pairIndex1 = i;
 				} else if (prevChar == fPairs[i]) {
-					fStartPos= fOffset - 1;
-					pairIndex1= i;
+					fStartPos = fOffset - 1;
+					pairIndex1 = i;
 				}
 			}
-			
+
 			// search for closing peer character next to the activation point
-			for (i= 1; i < fPairs.length; i= i + 2) {
+			for (i = 1; i < fPairs.length; i = i + 2) {
 				if (prevChar == fPairs[i]) {
-					fEndPos= fOffset - 1;
-					pairIndex2= i;
+					fEndPos = fOffset - 1;
+					pairIndex2 = i;
 				} else if (nextChar == fPairs[i]) {
-					fEndPos= fOffset;
-					pairIndex2= i;
+					fEndPos = fOffset;
+					pairIndex2 = i;
 				}
 			}
 
 			if (fEndPos > -1) {
-				fAnchor= RIGHT;
-				fStartPos= searchForOpeningPeer(fEndPos, fPairs[pairIndex2 - 1], fPairs[pairIndex2], fDocument);
+				fAnchor = RIGHT;
+				fStartPos = searchForOpeningPeer(fEndPos,
+						fPairs[pairIndex2 - 1], fPairs[pairIndex2], fDocument);
 				if (fStartPos > -1)
 					return true;
 				else
-					fEndPos= -1;
-			}	else if (fStartPos > -1) {
-				fAnchor= LEFT;
-				fEndPos= searchForClosingPeer(fStartPos, fPairs[pairIndex1], fPairs[pairIndex1 + 1], fDocument);
+					fEndPos = -1;
+			} else if (fStartPos > -1) {
+				fAnchor = LEFT;
+				fEndPos = searchForClosingPeer(fStartPos, fPairs[pairIndex1],
+						fPairs[pairIndex1 + 1], fDocument);
 				if (fEndPos > -1)
 					return true;
 				else
-					fStartPos= -1;
+					fStartPos = -1;
 			}
 
 		} catch (BadLocationException x) {
@@ -127,46 +140,49 @@ public class PHPPairMatcher {
 
 		return false;
 	}
-	
-	protected int searchForClosingPeer(int offset, int openingPeer, int closingPeer, IDocument document) throws IOException {
-		
-		fReader.configureForwardReader(document, offset + 1, document.getLength(), true, true);
-		
-		int stack= 1;
-		int c= fReader.read();
+
+	protected int searchForClosingPeer(int offset, int openingPeer,
+			int closingPeer, IDocument document) throws IOException {
+
+		fReader.configureForwardReader(document, offset + 1, document
+				.getLength(), true, true);
+
+		int stack = 1;
+		int c = fReader.read();
 		while (c != PHPCodeReader.EOF) {
 			if (c == openingPeer && c != closingPeer)
 				stack++;
 			else if (c == closingPeer)
 				stack--;
-				
+
 			if (stack == 0)
 				return fReader.getOffset();
-				
-			c= fReader.read();
+
+			c = fReader.read();
 		}
-		
-		return  -1;
+
+		return -1;
 	}
-	
-	protected int searchForOpeningPeer(int offset, int openingPeer, int closingPeer, IDocument document) throws IOException {
-		
+
+	protected int searchForOpeningPeer(int offset, int openingPeer,
+			int closingPeer, IDocument document) throws IOException {
+
 		fReader.configureBackwardReader(document, offset, true, true);
-		
-		int stack= 1;
-		int c= fReader.read();
+
+		int stack = 1;
+		int c = fReader.read();
 		while (c != PHPCodeReader.EOF) {
 			if (c == closingPeer && c != openingPeer)
 				stack++;
 			else if (c == openingPeer)
 				stack--;
-				
+
 			if (stack == 0)
 				return fReader.getOffset();
-				
-			c= fReader.read();
+
+			c = fReader.read();
 		}
-		
+
 		return -1;
 	}
-}
+}
\ No newline at end of file