Attachment 194085 Details for Bug 343691 – patch

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

[patch] patch

patchFor343691 (text/plain), 5.33 KB, created by Chris Jaun

on 2011-04-26 14:19:13 EDT

(hide)

Description:

Filename:

MIME Type:

Creator: Chris Jaun

Created: 2011-04-26 14:19:13 EDT

Size: 5.33 KB

patch

obsolete

>### Eclipse Workspace Patch 1.0
>#P org.eclipse.wst.jsdt.core
>Index: src/org/eclipse/wst/jsdt/core/Signature.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jsdt/plugins/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/core/Signature.java,v
>retrieving revision 1.14.2.2
>diff -u -r1.14.2.2 Signature.java
>--- src/org/eclipse/wst/jsdt/core/Signature.java	8 Jul 2010 15:24:42 -0000	1.14.2.2
>+++ src/org/eclipse/wst/jsdt/core/Signature.java	26 Apr 2011 18:18:33 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2000, 2010 IBM Corporation and others.
>+ * Copyright (c) 2000, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -1473,21 +1473,6 @@
> 					buffer.append('/');
> 				}
> 				break;
>-			 case C_DOLLAR :
>-			 	innerTypeStart = buffer.length();
>-			 	inAnonymousType = false;
>-			 	if (resolved) {
>-					// once we hit "$" there are no more package prefixes
>-					removePackageQualifiers = false;
>-					/**
>-					 * Convert '$' in resolved type signatures into '.'.
>-					 * NOTE: This assumes that the type signature is an inner type
>-					 * signature. This is true in most cases, but someone can define a
>-					 * non-inner type name containing a '$'.
>-					 */
>-					buffer.append('.');
>-			 	}
>-			 	break;
> 			 default :
> 				if (innerTypeStart != -1 && !inAnonymousType && Character.isDigit(c)) {
> 					inAnonymousType = true;
>Index: src/org/eclipse/wst/jsdt/internal/codeassist/CompletionEngine.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jsdt/plugins/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/codeassist/CompletionEngine.java,v
>retrieving revision 1.67.2.5
>diff -u -r1.67.2.5 CompletionEngine.java
>--- src/org/eclipse/wst/jsdt/internal/codeassist/CompletionEngine.java	13 Apr 2011 21:05:56 -0000	1.67.2.5
>+++ src/org/eclipse/wst/jsdt/internal/codeassist/CompletionEngine.java	26 Apr 2011 18:18:33 -0000
>@@ -7344,7 +7344,7 @@
> 	}
> 
> 	public static char[] createNonGenericTypeSignature(char[] qualifiedPackageName, char[] qualifiedTypeName) {
>-		return Signature.createCharArrayTypeSignature(CharOperation.replaceOnCopy(qualifiedTypeName, '.', '$'), true);
>+		return Signature.createCharArrayTypeSignature(qualifiedTypeName, true);
> 	}
> 	public static char[] createTypeSignature(char[] qualifiedPackageName, char[] qualifiedTypeName) {
> 		char[] name = new char[qualifiedTypeName.length];
>Index: src/org/eclipse/wst/jsdt/internal/core/util/BindingKeyParser.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jsdt/plugins/org.eclipse.wst.jsdt.core/src/org/eclipse/wst/jsdt/internal/core/util/BindingKeyParser.java,v
>retrieving revision 1.5.2.1
>diff -u -r1.5.2.1 BindingKeyParser.java
>--- src/org/eclipse/wst/jsdt/internal/core/util/BindingKeyParser.java	28 Sep 2010 21:15:35 -0000	1.5.2.1
>+++ src/org/eclipse/wst/jsdt/internal/core/util/BindingKeyParser.java	26 Apr 2011 18:18:33 -0000
>@@ -1,5 +1,5 @@
> /*******************************************************************************
>- * Copyright (c) 2005, 2010 IBM Corporation and others.
>+ * Copyright (c) 2005, 2011 IBM Corporation and others.
>  * All rights reserved. This program and the accompanying materials
>  * are made available under the terms of the Eclipse Public License v1.0
>  * which accompanies this distribution, and is available at
>@@ -168,7 +168,6 @@
> 							return this.token;
> 						}
> 						break;
>-					case '$':
> 					case '~':
> 						if (this.index == previousTokenEnd) {
> 							this.start = this.index+1;
>@@ -517,7 +516,7 @@
> 				return;
> 			}
> 			consumeTopLevelType();
>-			parseInnerType();
>+			//parseInnerType();
> 
> 			if (this.scanner.isAtParametersStart()) {
> 				this.scanner.skipParametersStart();
>#P org.eclipse.wst.jsdt.core.tests.compiler
>Index: src/org/eclipse/wst/jsdt/core/tests/compiler/regression/InferTypesTests.java
>===================================================================
>RCS file: /cvsroot/webtools/org.eclipse.jsdt/tests/org.eclipse.wst.jsdt.core.tests.compiler/src/org/eclipse/wst/jsdt/core/tests/compiler/regression/InferTypesTests.java,v
>retrieving revision 1.27.2.9
>diff -u -r1.27.2.9 InferTypesTests.java
>--- src/org/eclipse/wst/jsdt/core/tests/compiler/regression/InferTypesTests.java	15 Dec 2010 22:04:23 -0000	1.27.2.9
>+++ src/org/eclipse/wst/jsdt/core/tests/compiler/regression/InferTypesTests.java	26 Apr 2011 18:18:34 -0000
>@@ -1452,4 +1452,27 @@
> 				getDefaultOptions()
> 			);
> 		}
>+		
>+		public void testBUG317281() {
>+			CompilationUnitDeclaration declaration = this.runInferTest(
>+				"function A$b(){\n"+
>+				"}\n" +
>+				"A$b.prototype.fun1 = function() {};\n",
>+				"X.js",
>+				"class A$b extends Object{\n  void fun1()\n  A$b()\n}\n",
>+				getDefaultOptions()
>+			);
>+		}
>+		
>+		public void testBUG343691() {
>+			CompilationUnitDeclaration declaration = this.runInferTest(
>+				"function $(){\n"+
>+				"}\n" +
>+				"$.hasData = function(element) {};\n" +
>+				"$.prototype.jquery = \"\";\n",
>+				"X.js",
>+				"class $ extends Object{\n  String jquery;\n  $()\n  static void hasData(element)\n}\n",
>+				getDefaultOptions()
>+			);
>+		}
> }

Actions: View | Diff

Attachments on bug 343691: 193958 | 193959 | 194085