Fixed bug 341977: [DBCS 3.7] Open from clipboard does not work for DBCS.

3 files changed, 36 insertions, 5 deletions

diff --git a/org.eclipse.jdt.debug.tests/.settings/org.eclipse.core.resources.prefs b/org.eclipse.jdt.debug.tests/.settings/org.eclipse.core.resources.prefs
new file mode 100644
index 000000000..e00fed493
--- /dev/null
+++ b/org.eclipse.jdt.debug.tests/.settings/org.eclipse.core.resources.prefs
@@ -0,0 +1,3 @@
+#Thu Apr 07 18:09:53 CEST 2011
+eclipse.preferences.version=1
+encoding//tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java=UTF-8
diff --git a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java
index 3cd4f0de9..22626ecc8 100644
--- a/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java
+++ b/org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/ui/OpenFromClipboardTests.java
@@ -18,19 +18,26 @@ import junit.framework.Test;
 import junit.framework.TestCase;
 import junit.framework.TestSuite;
 
-import org.eclipse.core.resources.IProject;
-import org.eclipse.core.resources.ResourcesPlugin;
+import org.eclipse.jdt.debug.testplugin.JavaProjectHelper;
+
+import org.eclipse.swt.widgets.Display;
+
 import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.Path;
+
+import org.eclipse.core.resources.IProject;
+import org.eclipse.core.resources.ResourcesPlugin;
+
 import org.eclipse.jdt.core.IJavaProject;
 import org.eclipse.jdt.core.IPackageFragment;
 import org.eclipse.jdt.core.IPackageFragmentRoot;
 import org.eclipse.jdt.core.JavaModelException;
-import org.eclipse.jdt.debug.testplugin.JavaProjectHelper;
+
 import org.eclipse.jdt.internal.debug.ui.actions.OpenFromClipboardAction;
+
 import org.eclipse.jdt.launching.IVMInstall;
 import org.eclipse.jdt.launching.JavaRuntime;
-import org.eclipse.swt.widgets.Display;
+
 
 /**
  * Tests the Open from Clipboard action.
@@ -154,6 +161,17 @@ public class OpenFromClipboardTests extends TestCase {
 		pack.createCompilationUnit("OpenFromClipboard$Tests.java", buf.toString(), false, null);
 	}
 
+	private void setupTypeWithDBCSTest() throws JavaModelException {
+		IPackageFragment pack= fSourceFolder.createPackageFragment("p", false, null);
+		StringBuffer buf= new StringBuffer();
+		buf.append("package p;\n");
+		buf.append("public class 新規クラス {\n");
+		buf.append("	void getMatching$Pattern(){\n");
+		buf.append("	}\n");
+		buf.append("}\n");
+		pack.createCompilationUnit("新規クラス.java", buf.toString(), false, null);
+	}
+
 	public void testClassFileLine_1() throws Exception {
 		String s = "OpenFromClipboardTests.java:100";
 		assertEquals(JAVA_FILE_LINE, getMatachingPattern(s));
@@ -181,6 +199,16 @@ public class OpenFromClipboardTests extends TestCase {
 		assertEquals(1, matches.size());
 	}
 
+	public void testDBCS() throws Exception {
+		String s= "新規クラス.java:100";
+		assertEquals(JAVA_FILE_LINE, getMatachingPattern(s));
+
+		setupTypeWithDBCSTest();
+
+		List matches= getJavaElementMatches(s);
+		assertEquals(1, matches.size());
+	}
+
 	public void testClassFile_1() throws Exception {
 		String s = "OpenFromClipboardTests.java";
 		assertEquals(JAVA_FILE, getMatachingPattern(s));
diff --git a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java
index f9c733f02..9cc3a6617 100644
--- a/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java
+++ b/org.eclipse.jdt.debug.ui/ui/org/eclipse/jdt/internal/debug/ui/actions/OpenFromClipboardAction.java
@@ -82,7 +82,7 @@ public class OpenFromClipboardAction implements IWorkbenchWindowActionDelegate {
 	/**
 	 * Pattern to match a simple name e.g. <code>OpenFromClipboardAction</code>
 	 */
-	private static final String SIMPLE_NAME_PATTERN = "[\\w\\$]+"; //$NON-NLS-1$
+	private static final String SIMPLE_NAME_PATTERN= "[\\p{Lo}\\w\\$]+"; //$NON-NLS-1$
 
 	/**
 	 * Pattern to match a qualified name e.g.