Attachment 101535 Details for Bug 229014 – patch

Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

[patch] patch

patch229014.txt (text/plain), 2.14 KB, created by Frank Becker

on 2008-05-22 11:38:01 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Frank Becker

Created: 2008-05-22 11:38:01 EDT

Size: 2.14 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.mylyn.tasks.ui
>Index: src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskUrlHyperlinkDetector.java
>===================================================================
>RCS file: /cvsroot/tools/org.eclipse.mylyn/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskUrlHyperlinkDetector.java,v
>retrieving revision 1.3
>diff -u -r1.3 TaskUrlHyperlinkDetector.java
>--- src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskUrlHyperlinkDetector.java	1 Mar 2008 21:38:51 -0000	1.3
>+++ src/org/eclipse/mylyn/internal/tasks/ui/editors/TaskUrlHyperlinkDetector.java	22 May 2008 15:29:20 -0000
>@@ -35,6 +35,7 @@
> 		IDocument document = textViewer.getDocument();
> 
> 		int offset = region.getOffset();
>+		char doubleChar = ' ';
> 
> 		String urlString = null;
> 		if (document == null) {
>@@ -68,7 +69,29 @@
> 				if (urlOffsetInLine > -1) {
> 					ch = line.charAt(urlOffsetInLine);
> 				}
>-				startDoubleQuote = ch == '"';
>+				doubleChar = ch;
>+				switch (ch) {
>+				case '"':
>+					doubleChar = '"';
>+					break;
>+				case '\'':
>+					doubleChar = '\'';
>+					break;
>+				case '[':
>+					doubleChar = ']';
>+					break;
>+				case '(':
>+					doubleChar = ')';
>+					break;
>+				case '{':
>+					doubleChar = '}';
>+					break;
>+
>+				default:
>+					doubleChar = ' ';
>+					break;
>+				}
>+				startDoubleQuote = doubleChar != ' ';
> 			} while (Character.isUnicodeIdentifierStart(ch));
> 			urlOffsetInLine++;
> 
>@@ -93,7 +116,7 @@
> 
> 		if (startDoubleQuote) {
> 			int endOffset = -1;
>-			int nextDoubleQuote = line.indexOf('"', urlOffsetInLine);
>+			int nextDoubleQuote = line.indexOf(doubleChar, urlOffsetInLine);
> 			int nextWhitespace = line.indexOf(' ', urlOffsetInLine);
> 			if (nextDoubleQuote != -1 && nextWhitespace != -1) {
> 				endOffset = Math.min(nextDoubleQuote, nextWhitespace);
>@@ -109,6 +132,10 @@
> 
> 		// Set and validate URL string
> 		try {
>+			char lastChar = line.charAt(urlOffsetInLine + urlLength - 1);
>+			if (lastChar == ',' || lastChar == '.') {
>+				urlLength--;
>+			}
> 			urlString = line.substring(urlOffsetInLine, urlOffsetInLine + urlLength);
> 			new URL(urlString);
> 		} catch (MalformedURLException ex) {

Actions: View | Diff

Attachments on bug 229014: 101535 | 101536 | 101626 | 101629 | 104046 | 104047