Attachment #39554 for bug #96237

Lines 101-108 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/select/SelectionJavadocParser.java (-2 / +3 lines)
101	* Otherwise return null as we do not need this reference.	101	* Otherwise return null as we do not need this reference.
102	*/	102	*/
103	protected Object createMethodReference(Object receiver, List arguments) throws InvalidInputException {	103	protected Object createMethodReference(Object receiver, List arguments) throws InvalidInputException {
104	int start = (int) (this.identifierPositionStack[0] >>> 32);	104	int memberPtr = this.identifierLengthStack[0] - 1;
105	int end = (int) this.identifierPositionStack[0];	105	int start = (int) (this.identifierPositionStack[memberPtr] >>> 32);
		106	int end = (int) this.identifierPositionStack[memberPtr];
106	if (start <= this.selectionStart && this.selectionEnd <= end) {	107	if (start <= this.selectionStart && this.selectionEnd <= end) {
107	selectedNode = (ASTNode) super.createMethodReference(receiver, arguments);	108	selectedNode = (ASTNode) super.createMethodReference(receiver, arguments);
108	this.abort = true;	109	this.abort = true;




			TypeReference typeRef = (TypeReference) receiver;
			// Decide whether we have a constructor or not
			boolean isConstructor = false;
			int length = this.identifierLengthStack[0];
			if (typeRef == null) {
				char[] name = this.sourceParser.compilationUnit.getMainTypeName();
				TypeDeclaration typeDecl = getParsedTypeDeclaration();
				if (typeDecl != null) {
					name = typeDecl.name;
				}
				isConstructor = CharOperation.equals(this.identifierStack[length-1], name);
				typeRef = new JavadocImplicitTypeReference(name, this.memberStart);
			} else {
				char[] name = null;
				if (typeRef instanceof JavadocSingleTypeReference) {
					char[] name = ((JavadocSingleTypeReference)typeRef).token;
					isConstructor = CharOperation.equals(this.identifierStack[length-1], name);
				} else if (typeRef instanceof JavadocQualifiedTypeReference) {
					char[][] tokens = ((JavadocQualifiedTypeReference)typeRef).tokens;
					int last = tokens.length-1;
					isConstructor = CharOperation.equals(this.identifierStack[length-1], tokens[last]);
					if (isConstructor) {
						boolean valid = true;
						if (valid) {
							for (int i=0; i<length-1 && valid; i++) {
								valid = CharOperation.equals(this.identifierStack[i], tokens[i]);
							}
						}
						if (!valid) {
							// TODO (frederic) need a specific message after 3.2 ship delivery
							if (this.reportProblems) this.sourceParser.problemReporter().javadocInvalidReference(this.memberStart+1, this.scanner.getCurrentTokenEndPosition());
							return null;
						}
					}
				} else {
					throw new InvalidInputException();
				}
				isConstructor = CharOperation.equals(this.identifierStack[0], name);
			}
			// Create node
			if (arguments == null) {
				if (isConstructor) {
					JavadocAllocationExpression allocation = new JavadocAllocationExpression(this.identifierPositionStack[length-1]);
					allocation.type = typeRef;
					allocation.tagValue = this.tagValue;
					allocation.sourceEnd = this.scanner.getCurrentTokenEndPosition();
					if (length == 1) {
						allocation.qualification = new char[][] { this.identifierStack[0] };
					} else {
						System.arraycopy(this.identifierStack, 0, allocation.qualification = new char[length][], 0, length);
					}
					allocation.memberStart = this.memberStart;
					return allocation;
				} else {
					JavadocMessageSend msg = new JavadocMessageSend(this.identifierStack[length-1], this.identifierPositionStack[length-1]);
					msg.receiver = typeRef;
					msg.tagValue = this.tagValue;
					msg.sourceEnd = this.scanner.getCurrentTokenEndPosition();

				JavadocArgumentExpression[] expressions = new JavadocArgumentExpression[arguments.size()];
				arguments.toArray(expressions);
				if (isConstructor) {
					JavadocAllocationExpression allocation = new JavadocAllocationExpression(this.identifierPositionStack[length-1]);
					allocation.arguments = expressions;
					allocation.type = typeRef;
					allocation.tagValue = this.tagValue;
					allocation.sourceEnd = this.scanner.getCurrentTokenEndPosition();
					if (length == 1) {
						allocation.qualification = new char[][] { this.identifierStack[0] };
					} else {
						System.arraycopy(this.identifierStack, 0, allocation.qualification = new char[length][], 0, length);
					}
					allocation.memberStart = this.memberStart;
					return allocation;
				} else {
					JavadocMessageSend msg = new JavadocMessageSend(this.identifierStack[length-1], this.identifierPositionStack[length-1], expressions);
					msg.receiver = typeRef;
					msg.tagValue = this.tagValue;
					msg.sourceEnd = this.scanner.getCurrentTokenEndPosition();

	 */
	protected Object createTypeReference(int primitiveToken) {
		TypeReference typeRef = null;
		int size = this.identifierLengthStack[this.identifierLengthPtr];
		if (size == 1) { // Single Type ref
			typeRef = new JavadocSingleTypeReference(
						this.identifierStack[this.identifierPtr],

			System.arraycopy(this.identifierPositionStack, this.identifierPtr - size + 1, positions, 0, size);
			typeRef = new JavadocQualifiedTypeReference(tokens, positions, this.tagSourceStart, this.tagSourceEnd);
		}
//		this.identifierPtr -= size;
		return typeRef;
	}


		return null;
	}

	/**
	 * @param receiver
	 * @param start
	 * @throws InvalidInputException
	 */
	protected boolean parseQualifiedMember(Object receiver, int start) throws InvalidInputException {
		parseQualifiedName(true);
		boolean valid = true;
		if (receiver instanceof SingleTypeReference) {
			SingleTypeReference singleTypeRef = (SingleTypeReference) receiver;
			valid = CharOperation.equals(singleTypeRef.token, this.identifierStack[this.identifierPtr]);
		}
		else if (receiver instanceof QualifiedTypeReference) {
			QualifiedTypeReference qualifiedTypeRef = (QualifiedTypeReference) receiver;
			for (int i=0; i<this.identifierPtr && valid; i++) {
				valid = CharOperation.equals(qualifiedTypeRef.tokens[i], this.identifierStack[i]);
			}
		}
		if (valid) return true;
		int end = this.scanner.getCurrentTokenEndPosition() < this.lineEnd ?
				this.scanner.getCurrentTokenEndPosition() :
				this.scanner.getCurrentTokenStartPosition();
		end = end < this.lineEnd ? end : this.lineEnd;
		// TODO (frederic) need a specific message after 3.2 ship delivery
		if (this.reportProblems) this.sourceParser.problemReporter().javadocInvalidReference(start, end);
		return false;
	}

	/*
	 * Parse @return tag declaration
	 */

Lines 641-648 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/parser/AbstractCommentParser.java (-2 / +17 lines)
641		641
642	// Get member identifier	642	// Get member identifier
643	if (readToken() == TerminalTokens.TokenNameIdentifier) {	643	if (readToken() == TerminalTokens.TokenNameIdentifier) {
644	consumeToken();	644	if (this.scanner.currentCharacter == '.') {
645	pushIdentifier(true, false);	645	if (!parseQualifiedMember(receiver, start)) {
		646	return null;
		647	}
		648	} else {
		649	consumeToken();
		650	pushIdentifier(true, false);
		651	}
646	// Look for next token to know whether it's a field or method reference	652	// Look for next token to know whether it's a field or method reference
647	int previousPosition = this.index;	653	int previousPosition = this.index;
648	if (readToken() == TerminalTokens.TokenNameLPAREN) {	654	if (readToken() == TerminalTokens.TokenNameLPAREN) {
Lines 895-900 Link Here
895	return false;	901	return false;
896	}	902	}
897		903
		904	/**
		905	* Parse qualified member
		906	*
		907	* @param receiver
		908	* @param start
		909	* @throws InvalidInputException
		910	*/
		911	protected abstract boolean parseQualifiedMember(Object receiver, int start) throws InvalidInputException;
		912
898	/*	913	/*
899	* Parse a qualified name and built a type reference if the syntax is valid.	914	* Parse a qualified name and built a type reference if the syntax is valid.
900	*/	915	*/




		buffer.append(super.toString());
		return buffer.toString();
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.compiler.parser.AbstractCommentParser#createArgumentReference(char[], java.lang.Object, int)
	 */

			// Create method ref
			MethodRef methodRef = this.ast.newMethodRef();
			SimpleName methodName = new SimpleName(this.ast);
			int memberPtr = this.identifierLengthStack[0] - 1;
			methodName.internalSetIdentifier(new String(this.identifierStack[memberPtr]));
			methodRef.setName(methodName);
			int start = (int) (this.identifierPositionStack[memberPtr] >>> 32);
			int end = (int) this.identifierPositionStack[memberPtr];
			methodName.setSourceRange(start, end - start + 1);
			// Set qualifier
//			int end = methodName.getStartPosition()+methodName.getLength()-1;
			if (receiver == null) {
				start = this.memberStart;
				methodRef.setSourceRange(start, end - start + 1);

				while (parameters.hasNext()) {
					MethodRefParameter param = (MethodRefParameter) parameters.next();
					methodRef.parameters().add(param);
//					end = param.getStartPosition()+param.getLength()-1;
				}
			}
//			methodRef.setSourceRange(start, end-start+1);
			methodRef.setSourceRange(start, this.scanner.getCurrentTokenEndPosition()-start+1);
			return methodRef;
		}

	 * @see org.eclipse.jdt.internal.compiler.parser.AbstractCommentParser#createTypeReference()
	 */
	protected Object createTypeReference(int primitiveToken) {
		int size = this.identifierLengthStack[this.identifierLengthPtr];
		String[] identifiers = new String[size];
		int pos = this.identifierPtr - size + 1;
		for (int i = 0; i < size; i++) {

			int end = (int) this.identifierPositionStack[pos];
			typeRef.setSourceRange(start, end-start+1);
		}
		this.identifierPtr -= size;
		return typeRef;
	}

	/**
	 * @param receiver
	 * @param start
	 * @throws InvalidInputException
	 */
	protected boolean parseQualifiedMember(Object receiver, int start) throws InvalidInputException {
		createTag();
		return true;
	}


		return false;
	}

	/*
	 * Parse @return tag declaration
	 */
	protected boolean parseReturn() {
		createTag();
		return true;
	}

	/* (non-Javadoc)
	 * @see org.eclipse.jdt.internal.compiler.parser.AbstractCommentParser#parseTag(int)
	 */




 *******************************************************************************/
package org.eclipse.jdt.internal.compiler.ast;

import org.eclipse.jdt.core.compiler.CharOperation;
import org.eclipse.jdt.internal.compiler.impl.Constant;
import org.eclipse.jdt.internal.compiler.lookup.*;

public class JavadocAllocationExpression extends AllocationExpression {

	public int tagSourceStart, tagSourceEnd;
	public int tagValue, memberStart;
	public boolean superAccess = false;
	public char[][] qualification;

	public JavadocAllocationExpression(int start, int end) {
		this.sourceStart = start;
		this.sourceEnd = end;

		this((int) (pos >>> 32), (int) pos);
	}

	TypeBinding internalResolveType(Scope scope) {
	
		// Propagate the type checking to the arguments, and check if the constructor is defined.
		this.constant = Constant.NotAConstant;

					}
				}
			}
		} else if (this.resolvedType.isMemberType()) {
			boolean valid = qualification != null;
			int length = qualification.length;
			int idx = length;
			ReferenceBinding enclosingTypeBinding = allocationType;
			if (valid) {
				while (idx>0 && enclosingTypeBinding != null) {
					valid = CharOperation.equals(qualification[--idx], enclosingTypeBinding.sourceName);
					if (!valid) break;
					enclosingTypeBinding = enclosingTypeBinding.enclosingType();
				}
			}
			if (!valid || idx > 0 || enclosingTypeBinding != null) {
				// TODO (frederic) need a specific message after 3.2 ship delivery
				scope.problemReporter().javadocInvalidReference(this.memberStart+1, this.sourceEnd);
			}
		}
		if (isMethodUseDeprecated(this.binding, scope, true)) {
			scope.problemReporter().javadocDeprecatedMethod(this.binding, this, scope.getDeclarationModifiers());




	 * Otherwise return null as we do not need this reference.
	 */
	protected Object createMethodReference(Object receiver, List arguments) throws InvalidInputException {
		int memberPtr = this.identifierLengthStack[0] - 1;
		int refStart = (int) (this.identifierPositionStack[memberPtr] >>> 32);
		int refEnd = (int) this.identifierPositionStack[memberPtr];
		boolean inCompletion = (refStart <= (this.cursorLocation+1) && this.cursorLocation <= refEnd) // completion cursor is between first and last stacked identifiers
			|| ((refStart == (refEnd+1) && refEnd == this.cursorLocation)) // or it's a completion on empty token
			|| (this.memberStart == this.cursorLocation); // or it's a completion just after the member separator with an identifier after the cursor

				this.completionNode = new CompletionOnJavadocQualifiedTypeReference(tokens, this.identifierStack[this.identifierPtr], positions, this.tagSourceStart, this.tagSourceEnd);
			}
		}
		this.identifierPtr -= nbIdentifiers;

		if (CompletionEngine.DEBUG) {
			System.out.println("	completion partial qualified type="+completionNode); //$NON-NLS-1$




/*******************************************************************************
 * Copyright (c) 2000, 2006 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
 * http://www.eclipse.org/legal/epl-v10.html
 *
 * Contributors:
 *     IBM Corporation - initial API and implementation
 *******************************************************************************/
package org.eclipse.jdt.internal.compiler.ast;

import org.eclipse.jdt.core.compiler.CharOperation;
import org.eclipse.jdt.internal.compiler.lookup.*;

public class JavadocQualifiedAllocationExpression extends JavadocAllocationExpression {

public char[][] qualification;

public JavadocQualifiedAllocationExpression(int start, int end) {
	super(start, end);
}
public JavadocQualifiedAllocationExpression(long pos) {
	super(pos);
}

TypeBinding internalResolveType(Scope scope) {
	ReferenceBinding allocationType = (ReferenceBinding) super.internalResolveType(scope);
	if (this.binding.isValidBinding() &&  allocationType.isMemberType()) {
		boolean valid = qualification != null;
		if (valid) {
			ReferenceBinding enclosingTypeBinding = allocationType;
			int idx = qualification.length;
			while (idx>0 && enclosingTypeBinding.isMemberType()) {
				valid = CharOperation.equals(qualification[--idx], enclosingTypeBinding.sourceName);
				if (!valid) break;
				enclosingTypeBinding = enclosingTypeBinding.enclosingType();
			}
		}
		if (!valid) {
			// TODO (frederic) need a specific message after 3.2 ship delivery
			scope.problemReporter().javadocInvalidReference(this.memberStart+1, this.sourceEnd);
		}
	}
	if (isMethodUseDeprecated(this.binding, scope, true)) {
		scope.problemReporter().javadocDeprecatedMethod(this.binding, this, scope.getDeclarationModifiers());
	}
	return allocationType;
}
}




	// Use this static initializer to specify subset for tests
	// All specified tests which does not belong to the class are skipped...
	static {
//		TESTS_PREFIX = "testBug96237";
//		TESTS_NAMES = new String[] { "testBug68017javadocWarning2" };
//		TESTS_NUMBERS = new int[] { 129241 };
//		TESTS_RANGE = new int[] { 21, 50 };

				"}\n"
			},
			"----------\n" + 
			"1. ERROR in X.java (at line 5)\n" + 
			"	public class X extends RuntimeException {\n" + 
			"	             ^\n" + 
			"The serializable class X does not declare a static final serialVersionUID field of type long\n" + 
			"----------\n" + 
			"2. ERROR in X.java (at line 5)\n" + 
			"	public X(String message) {\n" + 
			"	                ^^^^^^^\n" + 
			"Javadoc: Missing tag for parameter message\n" + 

	}

	/**
	 * Bug 68726: [Javadoc] Target attribute in @see link triggers warning
	 * @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=68726">68726</a>
	 */
	public void testBug68726conform1() {
		runConformTest(
			new String[] {
				"X.java",
				"public class X {\n" + 
					"	/**\n" + 
					"	 *	@see Object <a href=\"http://www.eclipse.org\" target=\"_top\">Eclipse</a>\n" + 
					"	 */\n" + 
					"	void foo1() {}\n" + 
					"	/**@see Object <a href=\"http://www.eclipse.org\" target=\"_top\" target1=\"_top1\" target2=\"_top2\">Eclipse</a>*/\n" + 
					"	void foo2() {}\n" + 
					"}\n"	
			}
		);
	}
	public void testBug68726conform2() {
		runConformTest(
			new String[] {
				"X.java",
				"/**\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">IBM Home Page</a>\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
					"	*          IBM Home Page</a>\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
					"	*          IBM Home Page\n" + 
					"	* 			</a>\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
					"	*\n" + 
					"	*          IBM\n" + 
					"	*\n" + 
					"	*          Home Page\n" + 
					"	*\n" + 
					"	*\n" + 
					"	* 			</a>\n" + 
					"	* @see Object\n" + 
					"	*/\n" + 
					"public class X {\n" + 
					"}\n"	
			}
		);
	}
	public void testBug68726negative1() {
		runNegativeTest(
			new String[] {
				"X.java",
				"public class X {\n" + 
					"	/**\n" + 
					"	 * Invalid URL link references\n" + 
					"	 *\n" + 
					"	 * @see <a href=\"invalid\" target\n" + 
					"	 * @see <a href=\"invalid\" target=\n" + 
					"	 * @see <a href=\"invalid\" target=\"\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\"\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">invalid\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">invalid<\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">invalid</\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">invalid</a\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">invalid</a> no text allowed after the href\n" + 
					"	 */\n" + 
					"	void foo() {}\n" + 
					"}\n"	
			},
			"----------\n" + 
				"1. ERROR in X.java (at line 5)\n" + 
				"	* @see <a href=\"invalid\" target\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 6)\n" + 
				"	* @see <a href=\"invalid\" target=\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"3. ERROR in X.java (at line 7)\n" + 
				"	* @see <a href=\"invalid\" target=\"\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"4. ERROR in X.java (at line 8)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"5. ERROR in X.java (at line 9)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\"\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"6. ERROR in X.java (at line 10)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"7. ERROR in X.java (at line 11)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"8. ERROR in X.java (at line 12)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">invalid\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"9. ERROR in X.java (at line 13)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">invalid<\n" + 
				"	                                              ^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"10. ERROR in X.java (at line 14)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">invalid</\n" + 
				"	                                              ^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"11. ERROR in X.java (at line 15)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">invalid</a\n" + 
				"	                                              ^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"12. ERROR in X.java (at line 16)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">invalid</a> no text allowed after the href\n" + 
				"	                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Unexpected text\n" + 
				"----------\n"
		);
	}
	public void testBug68726negative2() {
		runNegativeTest(
			new String[] {
				"X.java",
				"/**\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">IBM Home Page\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
					"	*          IBM Home Page\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
					"	*          IBM Home Page<\n" + 
					"	* 			/a>\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
					"	*\n" + 
					"	*          IBM\n" + 
					"	*\n" + 
					"	*          Home Page\n" + 
					"	*\n" + 
					"	*\n" + 
					"	* 			\n" + 
					"	* @see Unknown\n" + 
					"	*/\n" + 
					"public class X {\n" + 
					"}\n"	
			},
			"----------\n" + 
				"1. ERROR in X.java (at line 2)\n" + 
				"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">IBM Home Page\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 3)\n" + 
				"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
				"	*          IBM Home Page\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"3. ERROR in X.java (at line 6)\n" + 
				"	*          IBM Home Page<\n" + 
				"	                        ^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"4. ERROR in X.java (at line 8)\n" + 
				"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
				"	*\n" + 
				"	*          IBM\n" + 
				"	*\n" + 
				"	*          Home Page\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"5. ERROR in X.java (at line 16)\n" + 
				"	* @see Unknown\n" + 
				"	       ^^^^^^^\n" + 
				"Javadoc: Unknown cannot be resolved to a type\n" + 
				"----------\n"
		);
	}

	/**
	 * Bug 69272: [Javadoc] Invalid malformed reference (missing separator)
	 * @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=69272">69272</a>
	 */

	}

	/**
	 * Bug 68726: [Javadoc] Target attribute in @see link triggers warning
	 * @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=68726">68726</a>
	 */
	public void testBug68726conform1() {
		runConformTest(
			new String[] {
				"X.java",
				"public class X {\n" + 
					"	/**\n" + 
					"	 *	@see Object <a href=\"http://www.eclipse.org\" target=\"_top\">Eclipse</a>\n" + 
					"	 */\n" + 
					"	void foo1() {}\n" + 
					"	/**@see Object <a href=\"http://www.eclipse.org\" target=\"_top\" target1=\"_top1\" target2=\"_top2\">Eclipse</a>*/\n" + 
					"	void foo2() {}\n" + 
					"}\n"	
			}
		);
	}
	public void testBug68726conform2() {
		runConformTest(
			new String[] {
				"X.java",
				"/**\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">IBM Home Page</a>\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
					"	*          IBM Home Page</a>\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
					"	*          IBM Home Page\n" + 
					"	* 			</a>\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
					"	*\n" + 
					"	*          IBM\n" + 
					"	*\n" + 
					"	*          Home Page\n" + 
					"	*\n" + 
					"	*\n" + 
					"	* 			</a>\n" + 
					"	* @see Object\n" + 
					"	*/\n" + 
					"public class X {\n" + 
					"}\n"	
			}
		);
	}
	public void testBug68726negative1() {
		runNegativeTest(
			new String[] {
				"X.java",
				"public class X {\n" + 
					"	/**\n" + 
					"	 * Invalid URL link references\n" + 
					"	 *\n" + 
					"	 * @see <a href=\"invalid\" target\n" + 
					"	 * @see <a href=\"invalid\" target=\n" + 
					"	 * @see <a href=\"invalid\" target=\"\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\"\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">invalid\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">invalid<\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">invalid</\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">invalid</a\n" + 
					"	 * @see <a href=\"invalid\" target=\"_top\">invalid</a> no text allowed after the href\n" + 
					"	 */\n" + 
					"	void foo() {}\n" + 
					"}\n"	
			},
			"----------\n" + 
				"1. ERROR in X.java (at line 5)\n" + 
				"	* @see <a href=\"invalid\" target\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 6)\n" + 
				"	* @see <a href=\"invalid\" target=\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"3. ERROR in X.java (at line 7)\n" + 
				"	* @see <a href=\"invalid\" target=\"\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"4. ERROR in X.java (at line 8)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"5. ERROR in X.java (at line 9)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\"\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"6. ERROR in X.java (at line 10)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"7. ERROR in X.java (at line 11)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"8. ERROR in X.java (at line 12)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">invalid\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"9. ERROR in X.java (at line 13)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">invalid<\n" + 
				"	                                              ^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"10. ERROR in X.java (at line 14)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">invalid</\n" + 
				"	                                              ^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"11. ERROR in X.java (at line 15)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">invalid</a\n" + 
				"	                                              ^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"12. ERROR in X.java (at line 16)\n" + 
				"	* @see <a href=\"invalid\" target=\"_top\">invalid</a> no text allowed after the href\n" + 
				"	                                               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Unexpected text\n" + 
				"----------\n"
		);
	}
	public void testBug68726negative2() {
		runNegativeTest(
			new String[] {
				"X.java",
				"/**\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">IBM Home Page\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
					"	*          IBM Home Page\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
					"	*          IBM Home Page<\n" + 
					"	* 			/a>\n" + 
					"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
					"	*\n" + 
					"	*          IBM\n" + 
					"	*\n" + 
					"	*          Home Page\n" + 
					"	*\n" + 
					"	*\n" + 
					"	* 			\n" + 
					"	* @see Unknown\n" + 
					"	*/\n" + 
					"public class X {\n" + 
					"}\n"	
			},
			"----------\n" + 
				"1. ERROR in X.java (at line 2)\n" + 
				"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">IBM Home Page\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"2. ERROR in X.java (at line 3)\n" + 
				"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
				"	*          IBM Home Page\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"3. ERROR in X.java (at line 6)\n" + 
				"	*          IBM Home Page<\n" + 
				"	                        ^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"4. ERROR in X.java (at line 8)\n" + 
				"	* @see <a href=\"http:/www.ibm.com\" target=\"_top\">\n" + 
				"	*\n" + 
				"	*          IBM\n" + 
				"	*\n" + 
				"	*          Home Page\n" + 
				"	       ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
				"Javadoc: Malformed link reference\n" + 
				"----------\n" + 
				"5. ERROR in X.java (at line 16)\n" + 
				"	* @see Unknown\n" + 
				"	       ^^^^^^^\n" + 
				"Javadoc: Unknown cannot be resolved to a type\n" + 
				"----------\n"
		);
	}

	/**
	 * Bug 70892: [1.5][Javadoc] Compiler should parse reference for inline tag @value
	 * @see <a href="http://bugs.eclipse.org/bugs/show_bug.cgi?id=70892">70892</a>
	 * These two tests should pass whatever the source level...

				"	class C { \n" + 
				"	    /**\n" + 
				"	     * Link {@link #B(Exception)} OK\n" + 
				"	     * Link {@link #B.C(String)} OK\n" + 
				"	     * Link {@link #foo()} OK\n" + 
				"	     * Link {@link #bar()} OK\n" + 
				"	     */\n" + 

	}

	/**
	 * Bug 96237: [javadoc] Inner types must be qualified
	 * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=96237"
	 */
	public void testBug96237() {
		runConformTest(
			new String[] {
				"boden/IAFAState.java",
				"package boden;\n" + 
				"public interface IAFAState {\n" + 
				"    public class ValidationException extends Exception {\n" + 
				"        public ValidationException(String variableName, IAFAState subformula) {\n" + 
				"            super(\"Variable \'\"+variableName+\"\' may be unbound in \'\"+subformula+\"\'\");\n" + 
				"        }\n" + 
				"        public void method() {}\n" + 
				"    }\n" + 
				"    /**\n" + 
				"     * Validates a formula for consistent bindings. Bindings are consistent, when at each point in time,\n" + 
				"     * the set of povided variables can be guaranteed to be a superset of the set of required variables.\n" + 
				"     * @throws ValidationException Thrown if a variable is unbound. \n" + 
				"     * @see ValidationException#IAFAState.ValidationException(String, IAFAState)\n" + 
				"     * @see IAFAState.ValidationException#method()\n" + 
				"     * @see ValidationException\n" + 
				"     * {@link ValidationException}\n" + 
				"     */\n" + 
				"    public void validate() throws ValidationException;\n" + 
				"}\n",
				"boden/TestValid.java",
				"package boden;\n" + 
				"import boden.IAFAState.ValidationException;\n" + 
				"/**\n" + 
				" * @see ValidationException\n" + 
				" * @see IAFAState.ValidationException\n" + 
				" */\n" + 
				"public class TestValid {\n" + 
				"	/**  \n" + 
				"	 * @see ValidationException#IAFAState.ValidationException(String, IAFAState)\n" + 
				"	 */\n" + 
				"	IAFAState.ValidationException valid1;\n" + 
				"	/**\n" + 
				"	 * @see IAFAState.ValidationException#IAFAState.ValidationException(String, IAFAState)\n" + 
				"	 */\n" + 
				"	IAFAState.ValidationException valid2;\n" + 
				"}\n"
			}
		);
	}
	public void testBug96237b() {
		runNegativeTest(
			new String[] {
				"boden/IAFAState.java",
				"package boden;\n" + 
				"public interface IAFAState {\n" + 
				"    public class ValidationException extends Exception {\n" + 
				"        public ValidationException(String variableName, IAFAState subformula) {\n" + 
				"            super(\"Variable \'\"+variableName+\"\' may be unbound in \'\"+subformula+\"\'\");\n" + 
				"        }\n" + 
				"        public void method() {}\n" + 
				"    }\n" + 
				"}\n",
				"boden/TestInvalid.java",
				"package boden;\n" + 
				"import boden.IAFAState.ValidationException;\n" + 
				"public class TestInvalid {\n" + 
				"	/** \n" + 
				"	 * @see ValidationException#ValidationException(String, IAFAState)\n" + 
				"	 */ \n" + 
				"	IAFAState.ValidationException invalid;\n" + 
				"}\n"
			},
			"----------\n" + 
			"1. ERROR in boden\\TestInvalid.java (at line 5)\n" + 
			"	* @see ValidationException#ValidationException(String, IAFAState)\n" + 
			"	                           ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
			"Javadoc: Invalid reference\n" + 
			"----------\n"
		);
	}
	public void testBug96237c() {
		runNegativeTest(
			new String[] {
				"boden/IAFAState.java",
				"package boden;\n" + 
				"public interface IAFAState {\n" + 
				"    public class ValidationException extends Exception {\n" + 
				"        public ValidationException(String variableName, IAFAState subformula) {\n" + 
				"            super(\"Variable \'\"+variableName+\"\' may be unbound in \'\"+subformula+\"\'\");\n" + 
				"        }\n" + 
				"        public void method() {}\n" + 
				"    }\n" + 
				"}\n",
				"boden/TestInvalid.java",
				"package boden;\n" + 
				"import boden.IAFAState.ValidationException;\n" + 
				"public class TestInvalid {\n" + 
				"	/**\n" + 
				"	 * @see IAFAState.ValidationException#ValidationException(String, IAFAState)\n" + 
				"	 */\n" + 
				"	IAFAState.ValidationException invalid;\n" + 
				"}\n"
			},
			"----------\n" + 
			"1. ERROR in boden\\TestInvalid.java (at line 5)\n" + 
			"	* @see IAFAState.ValidationException#ValidationException(String, IAFAState)\n" + 
			"	                                     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^\n" + 
			"Javadoc: Invalid reference\n" + 
			"----------\n"
		);
	}
	public void testBug96237d() {
		runNegativeTest(
			new String[] {
				"test/Test.java",
				"package test;\n" + 
				"public interface Test {\n" + 
				"	public class Level0 {\n" + 
				"		public Level0() {}\n" + 
				"	}\n" + 
				"	public interface Member {\n" + 
				"		public class Level1 {\n" + 
				"			public Level1() {}\n" + 
				"		}\n" + 
				"	}\n" + 
				"}\n",
				"test/C.java",
				"package test;\n" + 
				"public class C {\n" + 
				"	/**\n" + 
				"	 * @see Test.Level0#Test.Level0()\n" + 
				"	 */\n" + 
				"	Test.Level0 valid = new Test.Level0();\n" + 
				"	/**\n" + 
				"	 * @see Test.Level0#Level0()\n" + 
				"	 */\n" + 
				"	Test.Level0 invalid = new Test.Level0();\n" + 
				"}\n"
			},
			"----------\n" + 
			"1. ERROR in test\\C.java (at line 8)\n" + 
			"	* @see Test.Level0#Level0()\n" + 
			"	                   ^^^^^^^^\n" + 
			"Javadoc: Invalid reference\n" + 
			"----------\n"
		);
	}
	public void testBug96237e() {
		runNegativeTest(
			new String[] {
				"test/Test.java",
				"package test;\n" + 
				"public interface Test {\n" + 
				"	public class Level0 {\n" + 
				"		public Level0() {}\n" + 
				"	}\n" + 
				"	public interface Member {\n" + 
				"		public class Level1 {\n" + 
				"			public Level1() {}\n" + 
				"		}\n" + 
				"	}\n" + 
				"}\n",
				"test/C2.java",
				"package test;\n" + 
				"public class C2 {\n" + 
				"	/**\n" + 
				"	 * @see Test.Member.Level1#Test.Member.Level1()\n" + 
				"	 */\n" + 
				"	Test.Member.Level1 valid = new Test.Member.Level1();\n" + 
				"	/**\n" + 
				"	 * @see Test.Member.Level1#Level1()\n" + 
				"	 */\n" + 
				"	Test.Member.Level1 invalid = new Test.Member.Level1();\n" + 
				"	/**\n" + 
				"	 * @see Test.Member.Level1#Test.Level1()\n" + 
				"	 */\n" + 
				"	Test.Member.Level1 wrong = new Test.Member.Level1();\n" + 
				"}\n"
			},
			"----------\n" + 
			"1. ERROR in test\\C2.java (at line 8)\n" + 
			"	* @see Test.Member.Level1#Level1()\n" + 
			"	                          ^^^^^^^^\n" + 
			"Javadoc: Invalid reference\n" + 
			"----------\n" + 
			"2. ERROR in test\\C2.java (at line 12)\n" + 
			"	* @see Test.Member.Level1#Test.Level1()\n" + 
			"	                          ^^^^^^^^^^^^^\n" + 
			"Javadoc: Invalid reference\n" + 
			"----------\n"
		);
	}
	public void testBug96237f() {
		runConformTest(
			new String[] {
				"implicit/Valid.java",
				"package implicit;\n" + 
				"public interface Valid {\n" + 
				"	public class Level0 {\n" + 
				"		/**\n" + 
				"		 * @see #Valid.Level0() Valid\n" + 
				"		 */\n" + 
				"		public Level0() {}\n" + 
				"		/**\n" + 
				"		 * @see #Valid.Level0(String) Valid\n" + 
				"		 */\n" + 
				"		public Level0(String str) {}\n" + 
				"	}\n" + 
				"	public interface Member {\n" + 
				"		public class Level1 {\n" + 
				"			/**\n" + 
				"			 * @see #Valid.Member.Level1() Valid\n" + 
				"			 */\n" + 
				"			public Level1() {}\n" + 
				"			/**\n" + 
				"			 * @see #Valid.Member.Level1(int) Valid\n" + 
				"			 */\n" + 
				"			public Level1(int x) {}\n" + 
				"		}\n" + 
				"	}\n" + 
				"}\n"
			}
		);
	}
	public void testBug96237g() {
		runNegativeTest(
			new String[] {
				"implicit/Invalid.java",
				"package implicit;\n" + 
				"public interface Invalid {\n" + 
				"	public class Level0 {\n" + 
				"		/**\n" + 
				"		 * @see #Level0() Invalid\n" + 
				"		 */\n" + 
				"		public Level0() {}\n" + 
				"		/**\n" + 
				"		 * @see #Level0(String) Invalid\n" + 
				"		 */\n" + 
				"		public Level0(String str) {}\n" + 
				"	}\n" + 
				"	public interface Member {\n" + 
				"		public class Level1 {\n" + 
				"			/**\n" + 
				"			 * @see #Level1() Invalid\n" + 
				"			 * @see #Member.Level1() Invalid\n" + 
				"			 * @see #Invalid.Level1() Invalid\n" + 
				"			 */\n" + 
				"			public Level1() {}\n" + 
				"			/**\n" + 
				"			 * @see #Level1(int) Invalid\n" + 
				"			 * @see #Invalid.Level1(int) Invalid\n" + 
				"			 * @see #Member.Level1(int) Invalid\n" + 
				"			 */\n" + 
				"			public Level1(int x) {}\n" + 
				"		}\n" + 
				"	}\n" + 
				"}\n"
			},
			"----------\n" + 
			"1. ERROR in implicit\\Invalid.java (at line 5)\n" + 
			"	* @see #Level0() Invalid\n" + 
			"	        ^^^^^^^^\n" + 
			"Javadoc: Invalid reference\n" + 
			"----------\n" + 
			"2. ERROR in implicit\\Invalid.java (at line 9)\n" + 
			"	* @see #Level0(String) Invalid\n" + 
			"	        ^^^^^^^^^^^^^^\n" + 
			"Javadoc: Invalid reference\n" + 
			"----------\n" + 
			"3. ERROR in implicit\\Invalid.java (at line 16)\n" + 
			"	* @see #Level1() Invalid\n" + 
			"	        ^^^^^^^^\n" + 
			"Javadoc: Invalid reference\n" + 
			"----------\n" + 
			"4. ERROR in implicit\\Invalid.java (at line 17)\n" + 
			"	* @see #Member.Level1() Invalid\n" + 
			"	        ^^^^^^^^^^^^^^^\n" + 
			"Javadoc: Invalid reference\n" + 
			"----------\n" + 
			"5. ERROR in implicit\\Invalid.java (at line 18)\n" + 
			"	* @see #Invalid.Level1() Invalid\n" + 
			"	        ^^^^^^^^^^^^^^^^\n" + 
			"Javadoc: Invalid reference\n" + 
			"----------\n" + 
			"6. ERROR in implicit\\Invalid.java (at line 22)\n" + 
			"	* @see #Level1(int) Invalid\n" + 
			"	        ^^^^^^^^^^^\n" + 
			"Javadoc: Invalid reference\n" + 
			"----------\n" + 
			"7. ERROR in implicit\\Invalid.java (at line 23)\n" + 
			"	* @see #Invalid.Level1(int) Invalid\n" + 
			"	        ^^^^^^^^^^^^^^^^^^^\n" + 
			"Javadoc: Invalid reference\n" + 
			"----------\n" + 
			"8. ERROR in implicit\\Invalid.java (at line 24)\n" + 
			"	* @see #Member.Level1(int) Invalid\n" + 
			"	        ^^^^^^^^^^^^^^^^^^\n" + 
			"Javadoc: Invalid reference\n" + 
			"----------\n"
		);
	}

	/**
	 * Bug 116464: [javadoc] Unicode tag name are not correctly parsed
	 * @see "http://bugs.eclipse.org/bugs/show_bug.cgi?id=116464"
	 */

Lines 100-105 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/JavadocTest.java (+1 lines)
100	options.put(CompilerOptions.OPTION_ReportInvalidJavadocTagsDeprecatedRef, CompilerOptions.ENABLED);	100	options.put(CompilerOptions.OPTION_ReportInvalidJavadocTagsDeprecatedRef, CompilerOptions.ENABLED);
101	options.put(CompilerOptions.OPTION_ReportInvalidJavadocTagsNotVisibleRef, CompilerOptions.ENABLED);	101	options.put(CompilerOptions.OPTION_ReportInvalidJavadocTagsNotVisibleRef, CompilerOptions.ENABLED);
102	options.put(CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility, CompilerOptions.PRIVATE);	102	options.put(CompilerOptions.OPTION_ReportMissingJavadocTagsVisibility, CompilerOptions.PRIVATE);
		103	options.put(CompilerOptions.OPTION_ReportMissingSerialVersion, CompilerOptions.IGNORE);
103	return options;	104	return options;
104	}	105	}
105		106

Return to bug 96237

Lines 180-215 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/parser/JavadocParser.java (-20 / +74 lines)
180	TypeReference typeRef = (TypeReference) receiver;	180	TypeReference typeRef = (TypeReference) receiver;
181	// Decide whether we have a constructor or not	181	// Decide whether we have a constructor or not
182	boolean isConstructor = false;	182	boolean isConstructor = false;
		183	int length = this.identifierLengthStack[0];
183	if (typeRef == null) {	184	if (typeRef == null) {
184	char[] name = this.sourceParser.compilationUnit.getMainTypeName();	185	char[] name = this.sourceParser.compilationUnit.getMainTypeName();
185	TypeDeclaration typeDecl = getParsedTypeDeclaration();	186	TypeDeclaration typeDecl = getParsedTypeDeclaration();
186	if (typeDecl != null) {	187	if (typeDecl != null) {
187	name = typeDecl.name;	188	name = typeDecl.name;
188	}	189	}
189	isConstructor = CharOperation.equals(this.identifierStack[0], name);	190	isConstructor = CharOperation.equals(this.identifierStack[length-1], name);
190	typeRef = new JavadocImplicitTypeReference(name, this.memberStart);	191	typeRef = new JavadocImplicitTypeReference(name, this.memberStart);
191	} else {	192	} else {
192	char[] name = null;
193	if (typeRef instanceof JavadocSingleTypeReference) {	193	if (typeRef instanceof JavadocSingleTypeReference) {
194	name = ((JavadocSingleTypeReference)typeRef).token;	194	char[] name = ((JavadocSingleTypeReference)typeRef).token;
		195	isConstructor = CharOperation.equals(this.identifierStack[length-1], name);
195	} else if (typeRef instanceof JavadocQualifiedTypeReference) {	196	} else if (typeRef instanceof JavadocQualifiedTypeReference) {
196	char[][] tokens = ((JavadocQualifiedTypeReference)typeRef).tokens;	197	char[][] tokens = ((JavadocQualifiedTypeReference)typeRef).tokens;
197	name = tokens[tokens.length-1];	198	int last = tokens.length-1;
		199	isConstructor = CharOperation.equals(this.identifierStack[length-1], tokens[last]);
		200	if (isConstructor) {
		201	boolean valid = true;
		202	if (valid) {
		203	for (int i=0; i<length-1 && valid; i++) {
		204	valid = CharOperation.equals(this.identifierStack[i], tokens[i]);
		205	}
		206	}
		207	if (!valid) {
		208	// TODO (frederic) need a specific message after 3.2 ship delivery
		209	if (this.reportProblems) this.sourceParser.problemReporter().javadocInvalidReference(this.memberStart+1, this.scanner.getCurrentTokenEndPosition());
		210	return null;
		211	}
		212	}
198	} else {	213	} else {
199	throw new InvalidInputException();	214	throw new InvalidInputException();
200	}	215	}
201	isConstructor = CharOperation.equals(this.identifierStack[0], name);
202	}	216	}
203	// Create node	217	// Create node
204	if (arguments == null) {	218	if (arguments == null) {
205	if (isConstructor) {	219	if (isConstructor) {
206	JavadocAllocationExpression alloc = new JavadocAllocationExpression(this.identifierPositionStack[0]);	220	JavadocAllocationExpression allocation = new JavadocAllocationExpression(this.identifierPositionStack[length-1]);
207	alloc.type = typeRef;	221	allocation.type = typeRef;
208	alloc.tagValue = this.tagValue;	222	allocation.tagValue = this.tagValue;
209	alloc.sourceEnd = this.scanner.getCurrentTokenEndPosition();	223	allocation.sourceEnd = this.scanner.getCurrentTokenEndPosition();
210	return alloc;	224	if (length == 1) {
		225	allocation.qualification = new char[][] { this.identifierStack[0] };
		226	} else {
		227	System.arraycopy(this.identifierStack, 0, allocation.qualification = new char[length][], 0, length);
		228	}
		229	allocation.memberStart = this.memberStart;
		230	return allocation;
211	} else {	231	} else {
212	JavadocMessageSend msg = new JavadocMessageSend(this.identifierStack[0], this.identifierPositionStack[0]);	232	JavadocMessageSend msg = new JavadocMessageSend(this.identifierStack[length-1], this.identifierPositionStack[length-1]);
213	msg.receiver = typeRef;	233	msg.receiver = typeRef;
214	msg.tagValue = this.tagValue;	234	msg.tagValue = this.tagValue;
215	msg.sourceEnd = this.scanner.getCurrentTokenEndPosition();	235	msg.sourceEnd = this.scanner.getCurrentTokenEndPosition();
Lines 219-232 Link Here
219	JavadocArgumentExpression[] expressions = new JavadocArgumentExpression[arguments.size()];	239	JavadocArgumentExpression[] expressions = new JavadocArgumentExpression[arguments.size()];
220	arguments.toArray(expressions);	240	arguments.toArray(expressions);
221	if (isConstructor) {	241	if (isConstructor) {
222	JavadocAllocationExpression alloc = new JavadocAllocationExpression(this.identifierPositionStack[0]);	242	JavadocAllocationExpression allocation = new JavadocAllocationExpression(this.identifierPositionStack[length-1]);
223	alloc.arguments = expressions;	243	allocation.arguments = expressions;
224	alloc.type = typeRef;	244	allocation.type = typeRef;
225	alloc.tagValue = this.tagValue;	245	allocation.tagValue = this.tagValue;
226	alloc.sourceEnd = this.scanner.getCurrentTokenEndPosition();	246	allocation.sourceEnd = this.scanner.getCurrentTokenEndPosition();
227	return alloc;	247	if (length == 1) {
		248	allocation.qualification = new char[][] { this.identifierStack[0] };
		249	} else {
		250	System.arraycopy(this.identifierStack, 0, allocation.qualification = new char[length][], 0, length);
		251	}
		252	allocation.memberStart = this.memberStart;
		253	return allocation;
228	} else {	254	} else {
229	JavadocMessageSend msg = new JavadocMessageSend(this.identifierStack[0], this.identifierPositionStack[0], expressions);	255	JavadocMessageSend msg = new JavadocMessageSend(this.identifierStack[length-1], this.identifierPositionStack[length-1], expressions);
230	msg.receiver = typeRef;	256	msg.receiver = typeRef;
231	msg.tagValue = this.tagValue;	257	msg.tagValue = this.tagValue;
232	msg.sourceEnd = this.scanner.getCurrentTokenEndPosition();	258	msg.sourceEnd = this.scanner.getCurrentTokenEndPosition();
Lines 258-264 Link Here
258	*/	284	*/
259	protected Object createTypeReference(int primitiveToken) {	285	protected Object createTypeReference(int primitiveToken) {
260	TypeReference typeRef = null;	286	TypeReference typeRef = null;
261	int size = this.identifierLengthStack[this.identifierLengthPtr--];	287	int size = this.identifierLengthStack[this.identifierLengthPtr];
262	if (size == 1) { // Single Type ref	288	if (size == 1) { // Single Type ref
263	typeRef = new JavadocSingleTypeReference(	289	typeRef = new JavadocSingleTypeReference(
264	this.identifierStack[this.identifierPtr],	290	this.identifierStack[this.identifierPtr],
Lines 272-278 Link Here
272	System.arraycopy(this.identifierPositionStack, this.identifierPtr - size + 1, positions, 0, size);	298	System.arraycopy(this.identifierPositionStack, this.identifierPtr - size + 1, positions, 0, size);
273	typeRef = new JavadocQualifiedTypeReference(tokens, positions, this.tagSourceStart, this.tagSourceEnd);	299	typeRef = new JavadocQualifiedTypeReference(tokens, positions, this.tagSourceStart, this.tagSourceEnd);
274	}	300	}
275	this.identifierPtr -= size;	301	// this.identifierPtr -= size;
276	return typeRef;	302	return typeRef;
277	}	303	}
278		304
Lines 294-299 Link Here
294	return null;	320	return null;
295	}	321	}
296		322
		323	/**
		324	* @param receiver
		325	* @param start
		326	* @throws InvalidInputException
		327	*/
		328	protected boolean parseQualifiedMember(Object receiver, int start) throws InvalidInputException {
		329	parseQualifiedName(true);
		330	boolean valid = true;
		331	if (receiver instanceof SingleTypeReference) {
		332	SingleTypeReference singleTypeRef = (SingleTypeReference) receiver;
		333	valid = CharOperation.equals(singleTypeRef.token, this.identifierStack[this.identifierPtr]);
		334	}
		335	else if (receiver instanceof QualifiedTypeReference) {
		336	QualifiedTypeReference qualifiedTypeRef = (QualifiedTypeReference) receiver;
		337	for (int i=0; i<this.identifierPtr && valid; i++) {
		338	valid = CharOperation.equals(qualifiedTypeRef.tokens[i], this.identifierStack[i]);
		339	}
		340	}
		341	if (valid) return true;
		342	int end = this.scanner.getCurrentTokenEndPosition() < this.lineEnd ?
		343	this.scanner.getCurrentTokenEndPosition() :
		344	this.scanner.getCurrentTokenStartPosition();
		345	end = end < this.lineEnd ? end : this.lineEnd;
		346	// TODO (frederic) need a specific message after 3.2 ship delivery
		347	if (this.reportProblems) this.sourceParser.problemReporter().javadocInvalidReference(start, end);
		348	return false;
		349	}
		350
297	/*	351	/*
298	* Parse @return tag declaration	352	* Parse @return tag declaration
299	*/	353	*/

Lines 86-92 Link Here

(-)dom/org/eclipse/jdt/core/dom/DocCommentParser.java (-13 / +19 lines)
86	buffer.append(super.toString());	86	buffer.append(super.toString());
87	return buffer.toString();	87	return buffer.toString();
88	}	88	}
89		89
90	/* (non-Javadoc)	90	/* (non-Javadoc)
91	* @see org.eclipse.jdt.internal.compiler.parser.AbstractCommentParser#createArgumentReference(char[], java.lang.Object, int)	91	* @see org.eclipse.jdt.internal.compiler.parser.AbstractCommentParser#createArgumentReference(char[], java.lang.Object, int)
92	*/	92	*/
Lines 167-179 Link Here
167	// Create method ref	167	// Create method ref
168	MethodRef methodRef = this.ast.newMethodRef();	168	MethodRef methodRef = this.ast.newMethodRef();
169	SimpleName methodName = new SimpleName(this.ast);	169	SimpleName methodName = new SimpleName(this.ast);
170	methodName.internalSetIdentifier(new String(this.identifierStack[0]));	170	int memberPtr = this.identifierLengthStack[0] - 1;
		171	methodName.internalSetIdentifier(new String(this.identifierStack[memberPtr]));
171	methodRef.setName(methodName);	172	methodRef.setName(methodName);
172	int start = (int) (this.identifierPositionStack[0] >>> 32);	173	int start = (int) (this.identifierPositionStack[memberPtr] >>> 32);
173	int end = (int) this.identifierPositionStack[0];	174	int end = (int) this.identifierPositionStack[memberPtr];
174	methodName.setSourceRange(start, end - start + 1);	175	methodName.setSourceRange(start, end - start + 1);
175	// Set qualifier	176	// Set qualifier
176	// int end = methodName.getStartPosition()+methodName.getLength()-1;
177	if (receiver == null) {	177	if (receiver == null) {
178	start = this.memberStart;	178	start = this.memberStart;
179	methodRef.setSourceRange(start, end - start + 1);	179	methodRef.setSourceRange(start, end - start + 1);
Lines 188-197 Link Here
188	while (parameters.hasNext()) {	188	while (parameters.hasNext()) {
189	MethodRefParameter param = (MethodRefParameter) parameters.next();	189	MethodRefParameter param = (MethodRefParameter) parameters.next();
190	methodRef.parameters().add(param);	190	methodRef.parameters().add(param);
191	// end = param.getStartPosition()+param.getLength()-1;
192	}	191	}
193	}	192	}
194	// methodRef.setSourceRange(start, end-start+1);
195	methodRef.setSourceRange(start, this.scanner.getCurrentTokenEndPosition()-start+1);	193	methodRef.setSourceRange(start, this.scanner.getCurrentTokenEndPosition()-start+1);
196	return methodRef;	194	return methodRef;
197	}	195	}
Lines 239-245 Link Here
239	* @see org.eclipse.jdt.internal.compiler.parser.AbstractCommentParser#createTypeReference()	237	* @see org.eclipse.jdt.internal.compiler.parser.AbstractCommentParser#createTypeReference()
240	*/	238	*/
241	protected Object createTypeReference(int primitiveToken) {	239	protected Object createTypeReference(int primitiveToken) {
242	int size = this.identifierLengthStack[this.identifierLengthPtr--];	240	int size = this.identifierLengthStack[this.identifierLengthPtr];
243	String[] identifiers = new String[size];	241	String[] identifiers = new String[size];
244	int pos = this.identifierPtr - size + 1;	242	int pos = this.identifierPtr - size + 1;
245	for (int i = 0; i < size; i++) {	243	for (int i = 0; i < size; i++) {
Lines 307-321 Link Here
307	int end = (int) this.identifierPositionStack[pos];	305	int end = (int) this.identifierPositionStack[pos];
308	typeRef.setSourceRange(start, end-start+1);	306	typeRef.setSourceRange(start, end-start+1);
309	}	307	}
310	this.identifierPtr -= size;
311	return typeRef;	308	return typeRef;
312	}	309	}
313		310
314	/*	311	/**
315	* Parse @return tag declaration	312	* @param receiver
		313	* @param start
		314	* @throws InvalidInputException
316	*/	315	*/
317	protected boolean parseReturn() {	316	protected boolean parseQualifiedMember(Object receiver, int start) throws InvalidInputException {
318	createTag();
319	return true;	317	return true;
320	}	318	}
321		319
Lines 332-337 Link Here
332	return false;	330	return false;
333	}	331	}
334		332
		333	/*
		334	* Parse @return tag declaration
		335	*/
		336	protected boolean parseReturn() {
		337	createTag();
		338	return true;
		339	}
		340
335	/* (non-Javadoc)	341	/* (non-Javadoc)
336	* @see org.eclipse.jdt.internal.compiler.parser.AbstractCommentParser#parseTag(int)	342	* @see org.eclipse.jdt.internal.compiler.parser.AbstractCommentParser#parseTag(int)
337	*/	343	*/

Lines 149-156 Link Here

(-)codeassist/org/eclipse/jdt/internal/codeassist/complete/CompletionJavadocParser.java (-3 / +3 lines)
149	* Otherwise return null as we do not need this reference.	149	* Otherwise return null as we do not need this reference.
150	*/	150	*/
151	protected Object createMethodReference(Object receiver, List arguments) throws InvalidInputException {	151	protected Object createMethodReference(Object receiver, List arguments) throws InvalidInputException {
152	int refStart = (int) (this.identifierPositionStack[0] >>> 32);	152	int memberPtr = this.identifierLengthStack[0] - 1;
153	int refEnd = (int) this.identifierPositionStack[0];	153	int refStart = (int) (this.identifierPositionStack[memberPtr] >>> 32);
		154	int refEnd = (int) this.identifierPositionStack[memberPtr];
154	boolean inCompletion = (refStart <= (this.cursorLocation+1) && this.cursorLocation <= refEnd) // completion cursor is between first and last stacked identifiers	155	boolean inCompletion = (refStart <= (this.cursorLocation+1) && this.cursorLocation <= refEnd) // completion cursor is between first and last stacked identifiers
155	\|\| ((refStart == (refEnd+1) && refEnd == this.cursorLocation)) // or it's a completion on empty token	156	\|\| ((refStart == (refEnd+1) && refEnd == this.cursorLocation)) // or it's a completion on empty token
156	\|\| (this.memberStart == this.cursorLocation); // or it's a completion just after the member separator with an identifier after the cursor	157	\|\| (this.memberStart == this.cursorLocation); // or it's a completion just after the member separator with an identifier after the cursor
Lines 226-232 Link Here
226	this.completionNode = new CompletionOnJavadocQualifiedTypeReference(tokens, this.identifierStack[this.identifierPtr], positions, this.tagSourceStart, this.tagSourceEnd);	227	this.completionNode = new CompletionOnJavadocQualifiedTypeReference(tokens, this.identifierStack[this.identifierPtr], positions, this.tagSourceStart, this.tagSourceEnd);
227	}	228	}
228	}	229	}
229	this.identifierPtr -= nbIdentifiers;
230		230
231	if (CompletionEngine.DEBUG) {	231	if (CompletionEngine.DEBUG) {
232	System.out.println(" completion partial qualified type="+completionNode); //$NON-NLS-1$	232	System.out.println(" completion partial qualified type="+completionNode); //$NON-NLS-1$

Lines 10-24 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/ast/JavadocAllocationExpression.java (-3 / +21 lines)
10	*******************************************************************************/	10	*******************************************************************************/
11	package org.eclipse.jdt.internal.compiler.ast;	11	package org.eclipse.jdt.internal.compiler.ast;
12		12
		13	import org.eclipse.jdt.core.compiler.CharOperation;
13	import org.eclipse.jdt.internal.compiler.impl.Constant;	14	import org.eclipse.jdt.internal.compiler.impl.Constant;
14	import org.eclipse.jdt.internal.compiler.lookup.*;	15	import org.eclipse.jdt.internal.compiler.lookup.*;
15		16
16	public class JavadocAllocationExpression extends AllocationExpression {	17	public class JavadocAllocationExpression extends AllocationExpression {
17		18
18	public int tagSourceStart, tagSourceEnd;	19	public int tagSourceStart, tagSourceEnd;
19	public int tagValue;	20	public int tagValue, memberStart;
20	public boolean superAccess = false;	21	public boolean superAccess = false;
21		22	public char[][] qualification;
		23
22	public JavadocAllocationExpression(int start, int end) {	24	public JavadocAllocationExpression(int start, int end) {
23	this.sourceStart = start;	25	this.sourceStart = start;
24	this.sourceEnd = end;	26	this.sourceEnd = end;
Lines 28-34 Link Here
28	this((int) (pos >>> 32), (int) pos);	30	this((int) (pos >>> 32), (int) pos);
29	}	31	}
30		32
31	private TypeBinding internalResolveType(Scope scope) {	33	TypeBinding internalResolveType(Scope scope) {
32		34
33	// Propagate the type checking to the arguments, and check if the constructor is defined.	35	// Propagate the type checking to the arguments, and check if the constructor is defined.
34	this.constant = Constant.NotAConstant;	36	this.constant = Constant.NotAConstant;
Lines 120-125 Link Here
120	}	122	}
121	}	123	}
122	}	124	}
		125	} else if (this.resolvedType.isMemberType()) {
		126	boolean valid = qualification != null;
		127	int length = qualification.length;
		128	int idx = length;
		129	ReferenceBinding enclosingTypeBinding = allocationType;
		130	if (valid) {
		131	while (idx>0 && enclosingTypeBinding != null) {
		132	valid = CharOperation.equals(qualification[--idx], enclosingTypeBinding.sourceName);
		133	if (!valid) break;
		134	enclosingTypeBinding = enclosingTypeBinding.enclosingType();
		135	}
		136	}
		137	if (!valid \|\| idx > 0 \|\| enclosingTypeBinding != null) {
		138	// TODO (frederic) need a specific message after 3.2 ship delivery
		139	scope.problemReporter().javadocInvalidReference(this.memberStart+1, this.sourceEnd);
		140	}
123	}	141	}
124	if (isMethodUseDeprecated(this.binding, scope, true)) {	142	if (isMethodUseDeprecated(this.binding, scope, true)) {
125	scope.problemReporter().javadocDeprecatedMethod(this.binding, this, scope.getDeclarationModifiers());	143	scope.problemReporter().javadocDeprecatedMethod(this.binding, this, scope.getDeclarationModifiers());

Added Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/ast/JavadocQualifiedAllocationExpression.java (+50 lines)
1	/*******************************************************************************
2	* Copyright (c) 2000, 2006 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at
6	* http://www.eclipse.org/legal/epl-v10.html
7	*
8	* Contributors:
9	* IBM Corporation - initial API and implementation
10	*******************************************************************************/
11	package org.eclipse.jdt.internal.compiler.ast;
12
13	import org.eclipse.jdt.core.compiler.CharOperation;
14	import org.eclipse.jdt.internal.compiler.lookup.*;
15
16	public class JavadocQualifiedAllocationExpression extends JavadocAllocationExpression {
17
18	public char[][] qualification;
19
20	public JavadocQualifiedAllocationExpression(int start, int end) {
21	super(start, end);
22	}
23	public JavadocQualifiedAllocationExpression(long pos) {
24	super(pos);
25	}
26
27	TypeBinding internalResolveType(Scope scope) {
28	ReferenceBinding allocationType = (ReferenceBinding) super.internalResolveType(scope);
29	if (this.binding.isValidBinding() && allocationType.isMemberType()) {
30	boolean valid = qualification != null;
31	if (valid) {
32	ReferenceBinding enclosingTypeBinding = allocationType;
33	int idx = qualification.length;
34	while (idx>0 && enclosingTypeBinding.isMemberType()) {
35	valid = CharOperation.equals(qualification[--idx], enclosingTypeBinding.sourceName);
36	if (!valid) break;
37	enclosingTypeBinding = enclosingTypeBinding.enclosingType();
38	}
39	}
40	if (!valid) {
41	// TODO (frederic) need a specific message after 3.2 ship delivery
42	scope.problemReporter().javadocInvalidReference(this.memberStart+1, this.sourceEnd);
43	}
44	}
45	if (isMethodUseDeprecated(this.binding, scope, true)) {
46	scope.problemReporter().javadocDeprecatedMethod(this.binding, this, scope.getDeclarationModifiers());
47	}
48	return allocationType;
49	}
50	}