Attachment #97607 for bug #227043




		this.scanner.getNextChar();
		this.column += 2;
		this.scanner.skipComments = true;
		StringBuffer tokensBuffer = new StringBuffer();

		// Consume text token per token
		int maxColumn = this.formatter.preferences.comment_line_length + 1;
		int previousToken = -1;

		int lineNumber = scannerLine;
		int lastTextLine = -1;
		boolean openedString = false;
		boolean openedChar = false;
		while (!this.scanner.atEnd()) {
			
			// Consume token

				String msg = iie.getMessage();
				boolean insertSpace = (previousToken == TerminalTokens.TokenNameWHITESPACE || newLine) && !firstWord;
				if (msg == Scanner.INVALID_CHARACTER_CONSTANT) {
					if (insertSpace) {
						tokensBuffer.append(' ');
					} else {
						if (insertSpace) {
							buffer.append(' ');
							this.column++;
						}
						openedChar = true;
					}
					tokensBuffer.append('\'');
					this.column++;
				} else if (msg == Scanner.INVALID_CHAR_IN_STRING) {
					if (openedString) {
						openedString = false;
					} else {
						if (insertSpace) {
							tokensBuffer.append(' ');
							this.column++;
						}
						openedString = true;
					}
					tokensBuffer.append('"');
					this.column++;
				} else {
					// skip failure
				}

			}
			
			// Look at specific tokens
    		boolean insertSpace = (previousToken == TerminalTokens.TokenNameWHITESPACE || newLine) && (!firstWord || !hasTokens);
			switch (token) {
				case TerminalTokens.TokenNameWHITESPACE:
					buffer.append(tokensBuffer);
					this.column += tokensBuffer.length();
					tokensBuffer.setLength(0);
					previousToken = token;
					lineNumber = Util.getLineNumber(this.scanner.getCurrentTokenEndPosition(), this.lineEnds, scannerLine>1 ? scannerLine-2 : 0, this.maxLines);
					if (lineNumber > scannerLine) {

					scannerLine = lineNumber;
					continue;
				case TerminalTokens.TokenNameMULTIPLY:
					previousToken = token;
					lineNumber = Util.getLineNumber(this.scanner.getCurrentTokenEndPosition(), this.lineEnds, scannerLine>1 ? scannerLine-2 : 0, this.maxLines);
					if (this.scanner.currentCharacter == '/') {
						// Add remaining buffered tokens
						if (tokensBuffer.length() > 0) {
							buffer.append(tokensBuffer);
							this.column += tokensBuffer.length();
						}
						// end of comment
						if (multiLines) {
					    	buffer.append(this.lineSeparator);

						}
						buffer.append(' ');
			    		buffer.append(BLOCK_FOOTER);
				    	this.column += BLOCK_FOOTER_LENGTH + 1;
				    	this.scanner.getNextChar(); // reach the end of scanner
				    	continue;
					}
					scannerLine = lineNumber;
					continue;
				case TerminalTokens.TokenNameLESS:
					// We cannot break tags
					StringBuffer breakBuffer = new StringBuffer();
					int start = this.scanner.startPosition;
		    		int tokenLength = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - this.scanner.startPosition;
					breakBuffer.append(this.scanner.source, this.scanner.startPosition, tokenLength);
					try {
						boolean closing = false;
						if ((token = this.scanner.getNextToken()) == TerminalTokens.TokenNameDIVIDE) {
			    			tokenLength = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - this.scanner.startPosition;
							breakBuffer.append(this.scanner.source, this.scanner.startPosition, tokenLength);
							token = this.scanner.getNextToken();
							closing = true;
						}
						if (token == TerminalTokens.TokenNameIdentifier) {
			    			tokenLength = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - this.scanner.startPosition;
							breakBuffer.append(this.scanner.source, this.scanner.startPosition, tokenLength);
							token = this.scanner.getNextToken();
							if (token == TerminalTokens.TokenNameGREATER) {
				    			tokenLength = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - this.scanner.startPosition;
								breakBuffer.append(this.scanner.source, this.scanner.startPosition, tokenLength);
								if ((this.column + breakBuffer.length()) > maxColumn) {
							    	buffer.append(this.lineSeparator);
							    	this.column = 1;
							    	printIndentationIfNecessary(buffer);
						    		buffer.append(BLOCK_LINE_PREFIX);
							    	this.column += BLOCK_LINE_PREFIX_LENGTH;
									multiLines = true;
								} else if (!closing) {
									buffer.append(' ');
									this.column++;
								}
								buffer.append(breakBuffer);
								this.column += breakBuffer.length();
								previousToken = token;
								scannerLine = lineNumber;
								newLine = false;
								continue;
							}
						}
					}
					catch (InvalidInputException iie) {
						// forget as we're started after next token
					}
					// Need to retrieve correct position
					this.scanner.resetTo(start, currentTokenEndPosition-1);
					try {
	                    token = this.scanner.getNextToken();
                    } catch (InvalidInputException e) {
	                    // will not happen
                    }
					break;
			}

			// Look at gap and insert corresponding lines if necessary

					 }
				}
				for (int i=0; i<linesGap; i++) {
					// Add remaining buffered tokens
					if (tokensBuffer.length() > 0) {
						buffer.append(tokensBuffer);
						tokensBuffer.setLength(0);
					}
			    	buffer.append(this.lineSeparator);
			    	this.column = 1;
			    	printIndentationIfNecessary(buffer);

    		hasTokens = true;
    		if (!hastTextOnFirstLine && scannerLine == firstLine) {
    			hastTextOnFirstLine = true;
    			this.column++;
    		}
    		int lastColumn = this.column + tokensBuffer.length() + tokenLength;
    		if (previousToken == -1 || insertSpace) lastColumn++;
    		
    		// Append next token inserting a new line if max line is reached
			if (!firstWord && lastColumn > maxColumn) {
		    	String tokensString = tokensBuffer.toString().trim();
				if ((firstColumn+tokensString.length()+tokenLength) > maxColumn) {
					// there won't be enough room even if we break the line before the buffered tokens
					// So add the buffered tokens now
					if (buffer.length() == 0) {
						buffer.append(' ');
						this.column++;
					}
					buffer.append(tokensString);
					this.column += tokensString.length();
					tokensBuffer.setLength(0);
				}
				// not enough space on the line
		    	buffer.append(this.lineSeparator);
		    	this.column = 1;
		    	printIndentationIfNecessary(buffer);
	    		buffer.append(BLOCK_LINE_PREFIX);
		    	this.column += BLOCK_LINE_PREFIX_LENGTH;
		    	if (tokensBuffer.length() > 0) {
					buffer.append(tokensString);
					this.column += tokensString.length();
					tokensBuffer.setLength(0);
		    	}
				buffer.append(this.scanner.source, tokenStart, tokenLength);
				this.column += tokenLength;
				multiLines = true;
			} else {
				// append token to the line
				if (insertSpace)  {
					tokensBuffer.append(' ');
				}
				tokensBuffer.append(this.scanner.source, tokenStart, tokenLength);
			}
			previousToken = token;
			newLine = false;

					replacement.append(this.lineSeparator);
					this.column = 1;
					printIndentationIfNecessary(replacement);
					if (buffer.charAt(0) == ' ') {
						replacement.append(' ');
						replacement.append('*');
					} else {
						replacement.append(BLOCK_LINE_PREFIX);
						this.column++;
					}
			    	this.column = col;
				}
			} else {
				if (buffer.charAt(0) != ' ') {
					replacement.append(' ');
					this.column++;
				}
			}
			replacement.append(buffer);
			addReplaceEdit(currentTokenStartPosition, currentTokenEndPosition-1, replacement.toString());

		int maxNodes = block.nodesPtr;

		// format tag section if necessary
		int maxColumn = this.formatter.preferences.comment_line_length;
		boolean clearBlankLines = this.formatter.preferences.comment_clear_blank_lines_in_javadoc_comment;
		if (!block.isDescription()) {
			this.column += previousEnd - block.sourceStart + 1;
			if (block.isInlined()) 	{
				this.column++; // Add extra character for inline tag
			}
			FormatJavadocReference reference= block.reference;
			if (reference != null) {
				// format reference
				StringBuffer buffer = new StringBuffer();
				printJavadocBlockReference(buffer, reference, block);
			    addReplaceEdit(previousEnd+1, reference.sourceEnd, buffer.toString());
				previousEnd = reference.sourceEnd;
				this.column += previousEnd - reference.sourceStart + 1;
			}

			// Nothing else to do if the tag has no node

		}
		
		// tag section: iterate through the blocks composing this tag but the last one
		int maxColumn = this.formatter.preferences.comment_line_length;
		if (block.isHeaderLine()) maxColumn++;
		for (int i=0; i<=maxNodes; i++) {
			FormatJavadocNode node = block.nodes[i];

			
			// Print empty lines before the node
			int textLength = -1;
			int newLines;
			if (i == 0) {
				newLines = this.formatter.preferences.comment_insert_new_line_for_parameter && !block.isInlined() && block.isParamTag() ? 1 : 0;
				if (nodeStart > (previousEnd+1)) {
			   		printJavadocGapLines(previousEnd+1, nodeStart-1, newLines, clearBlankLines, false, null);
				} else {
					StringBuffer buffer = new StringBuffer();
					if (newLines > 0) {

					}
				}
			} else {
				newLines = this.column > this.formatter.preferences.comment_line_length ? 1 : 0;
				if (node.isText()) {
					// Need to verify if new line is necessary for immutable tag
					FormatJavadocText text = (FormatJavadocText) node;

								newLines = 1;
								((FormatJavadocText)node).linesBefore = 1;
							}
				   			printJavadocGapLines(previousEnd+1, nodeStart-1, newLines, clearBlankLines, false, null);
						} catch (InvalidInputException iie) {
							// skip
						}
					} else {
			   			printJavadocGapLines(previousEnd+1, nodeStart-1, newLines, clearBlankLines, false, null);
					}
				}
			}

						if (textLength == -1) {
							textLength = getTextLength(block, text);
						}
						// Indent if new line was added
						if (newLines > 0) {
							int col = this.column;
							StringBuffer buffer = new StringBuffer();
							int textEnd = text.separatorsPtr == -1 ? text.sourceEnd : (int) (text.separators[0] >>> 32);
							printJavadocTextLine(buffer, text.sourceStart, textEnd, block, true, true, true);
							addReplaceEdit(text.sourceStart, textEnd, buffer.toString());
							textLength -= this.column - col;
						}
						this.column += textLength;
					} else {
						printJavadocHtmlTag(text, block);

		}
	}

	private void printJavadocBlockReference(StringBuffer buffer, FormatJavadocReference reference, FormatJavadocBlock block) {

		boolean indentRootTags = this.formatter.preferences.comment_indent_root_tags && !block.isDescription();
		boolean indentParamTag = this.formatter.preferences.comment_indent_parameter_description && block.isParamTag();
		boolean headerLine = block.isHeaderLine() && this.lastNumberOfNewLines == 0;
		StringBuffer tokensBuffer = new StringBuffer();
		
		// First we need to know what is the indentation
		int firstColumn = 1 + this.indentationLevel + BLOCK_LINE_PREFIX_LENGTH;
		if (headerLine) firstColumn++;
		StringBuffer indentationBuffer = null;
		if (indentRootTags) {
			int indentLevel = this.indentationLevel;
			int indentations = this.numberOfIndentations;
			this.numberOfIndentations += (BLOCK_LINE_PREFIX_LENGTH / this.indentationSize) + 1;
			this.indentationLevel = this.numberOfIndentations * this.indentationSize;
			int currentColumn = this.column;
			this.column = firstColumn;
			if (indentParamTag) {
				this.indentationLevel += this.indentationSize;
				this.numberOfIndentations++;
			}
			printIndentationIfNecessary(indentationBuffer = new StringBuffer());
			firstColumn = this.indentationLevel + 1;
			this.column = currentColumn;
			this.indentationLevel = indentLevel;
			this.numberOfIndentations = indentations;
		}

		// Scan the text token per token to compact it and size it the max line length
		int maxColumn = this.formatter.preferences.comment_line_length + 1;
		int previousToken = -1;
		this.scanner.resetTo(reference.sourceStart, reference.sourceEnd);
		while (!this.scanner.atEnd()) {
			int token;
			try {
				token = this.scanner.getNextToken();
				switch (token) {
					case TerminalTokens.TokenNameWHITESPACE:
						buffer.append(tokensBuffer);
						this.column += tokensBuffer.length();
						tokensBuffer.setLength(0);
						if (CharOperation.indexOf('\n', this.scanner.source, this.scanner.startPosition, this.scanner.getCurrentTokenEndPosition()) >= 0) {
							// consume line break
							loop: while (true) {
								token = this.scanner.getNextToken();
								switch (token) {
									case TerminalTokens.TokenNameWHITESPACE:
									case TerminalTokens.TokenNameMULTIPLY:
										previousToken = token; // will not insert space
										continue;
									default:
										break loop;
								}
							}
							break;
						}
						previousToken = token;
						continue;
					case TerminalTokens.TokenNameMULTIPLY:
						previousToken = token;
						continue;
				}
			} catch (InvalidInputException iie) {
				continue;
			}
			int tokenStart = this.scanner.getCurrentTokenStartPosition();
    		int tokenLength = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - tokenStart;
    		int lastColumn = this.column + tokensBuffer.length() + tokenLength;
    		boolean insertSpace = previousToken == TerminalTokens.TokenNameWHITESPACE || previousToken == -1;
    		if (insertSpace) lastColumn++;
    		if (headerLine) {
    			// special case when text is on the same line of the javadoc's header
    			if (lastColumn > maxColumn)  {
    				lastColumn--; // new line gives an extra character
    			}
    		}
			if (lastColumn > maxColumn) {
		    	String tokensString = tokensBuffer.toString().trim();
		    	int indentLength = indentationBuffer==null ? 0 : indentationBuffer.length();
				if ((firstColumn-1+indentLength+tokensString.length()+tokenLength) > maxColumn) {
					// there won't be enough room even if we break the line before the buffered tokens
					// So add the buffered tokens now
					if (buffer.length() == 0) {
						buffer.append(' ');
						this.column++;
					}
					buffer.append(tokensString);
					this.column += tokensString.length();
					tokensBuffer.setLength(0);
				}
				// not enough space on the line
		    	buffer.append(this.lineSeparator);
		    	this.column = 1;
		    	printIndentationIfNecessary(buffer);
	    		buffer.append(BLOCK_LINE_PREFIX);
		    	this.column = headerLine ? firstColumn-1 : firstColumn;
		    	if (indentationBuffer != null) {
		    		buffer.append(indentationBuffer);
		    	}
		    	if (tokensBuffer.length() > 0) {
					buffer.append(tokensString);
					this.column += tokensString.length();
					tokensBuffer.setLength(0);
		    	}
				buffer.append(this.scanner.source, tokenStart, tokenLength);
				this.column += tokenLength;
				if (headerLine) {
					firstColumn--;
					headerLine = false;
				}
			} else {
				// append token to the line
				if (insertSpace) {
					tokensBuffer.append(' ');
				}
				tokensBuffer.append(this.scanner.source, tokenStart, tokenLength);
			}
			previousToken = token;
		}
		if (tokensBuffer.length() > 0) {
			buffer.append(tokensBuffer);
			this.column += tokensBuffer.length();
		}
    }

	private int getTextLength(FormatJavadocBlock block, FormatJavadocText text) {

		// Simple for one line tags

		int textStart = text.sourceStart;
		int nextStart = textStart;
		int startLine = Util.getLineNumber(textStart, this.lineEnds, 0, this.maxLines);
		boolean textOnNewLine = (text == block.nodes[0] && ((!block.isInlined() && block.isParamTag() && this.formatter.preferences.comment_insert_new_line_for_parameter) || !block.hasTextOnTagLine())) || text.linesBefore > 0;
	    int htmlTagID = text.getHtmlTagID();
	    StringBuffer buffer = new StringBuffer();


					}
					if (textStart < previousEnd) {
						addReplaceEdit(textStart, previousEnd, buffer.toString());
//						this.column += buffer.length();
					}
					boolean immutable = htmlTag == null ? false : htmlTag.isImmutableHtmlTag();
					boolean overEndLine = false;

								if (indentationBuffer != null) {
									addInsertEdit(node.sourceStart, indentationBuffer.toString());
								}
//								buffer.append(' ');
//								this.column++;
							}
						} else {
							linesAfter = printJavadocHtmlTag(htmlTag, block);

						printJavadocGapLines(previousEnd+1, nextStart, linesAfter, clearBlankLines, false, buffer);
						textOnNewLine = true;
					}
					boolean needIndentation = textOnNewLine;
					if (idx > 0) {
						if (!needIndentation && (text.htmlIndexes[idx-1] & JAVADOC_TAGS_ID_MASK) == JAVADOC_SEPARATOR_TAGS_ID) {
							needIndentation = true;

					if (clearBlankLines) {
						// keep previously computed lines after
					} else {
//						if (wasHtmlTag || idx==0 || (idx==max && ((text.htmlIndexes[max] & JAVADOC_TAGS_ID_MASK) == htmlTagID))) {
						if (idx==0 || (idx==max && ((text.htmlIndexes[max] & JAVADOC_TAGS_ID_MASK) == htmlTagID)) || (idx < max && wasHtmlTag && (text.htmlIndexes[idx-1] & JAVADOC_TAGS_ID_MASK) != JAVADOC_IMMUTABLE_TAGS_ID)) {
							if (linesAfter < linesGap) {
								linesAfter = linesGap;

		int textStart = text.sourceStart;
		int nextStart = textStart;
		int startLine = Util.getLineNumber(textStart, this.lineEnds, 0, this.maxLines);
		boolean textOnNewLine = (text == block.nodes[0] && !block.isInlined() && block.isParamTag() && (this.formatter.preferences.comment_insert_new_line_for_parameter || !block.hasTextOnTagLine())) || text.linesBefore > 0 || this.column > (this.formatter.preferences.comment_line_length+1);

		// Iterate on text line separators
		for (int idx=0, max=text.separatorsPtr; idx<=max ; idx++) {

		boolean indentRootTags = this.formatter.preferences.comment_indent_root_tags && !block.isDescription();
		boolean indentParamTag = this.formatter.preferences.comment_indent_parameter_description && block.isParamTag();
		boolean headerLine = (buffer.indexOf(Util.LINE_SEPARATOR) < 0) && block.isHeaderLine() && this.lastNumberOfNewLines == 0;
		StringBuffer tokensBuffer = new StringBuffer();
		
		// First we need to know what is the indentation
		int firstColumn = 1 + this.indentationLevel + BLOCK_LINE_PREFIX_LENGTH;

			printIndentationIfNecessary(indentationBuffer = new StringBuffer());
			if (needIndentation) {
				this.column = firstColumn;
				printIndentationIfNecessary(buffer);
			}
			firstColumn = this.indentationLevel + 1;
			this.column = currentColumn < firstColumn ? firstColumn : currentColumn;

					String msg = iie.getMessage();
					if (msg == Scanner.INVALID_CHARACTER_CONSTANT) {
						if (insertSpace) {
							tokensBuffer.append(' ');
							this.column++;
						}
						tokensBuffer.append('\'');
						this.column++;
					} else if (msg == Scanner.INVALID_CHAR_IN_STRING) {
						if (openedString) {
							openedString = false;
						} else {
							if (insertSpace) {
								tokensBuffer.append(' ');
								this.column++;
							}
							openedString = true;
						}
						tokensBuffer.append('"');
						this.column++;
					} else {
						// skip failure
					}

				}
				if (token == TerminalTokens.TokenNameWHITESPACE) {
					previousToken = token;
					buffer.append(tokensBuffer);
					this.column += tokensBuffer.length();
					tokensBuffer.setLength(0);
					continue;
				}
    			int tokenStart = this.scanner.getCurrentTokenStartPosition();
	    		int tokenLength = (this.scanner.atEnd() ? this.scanner.eofPosition : this.scanner.currentPosition) - tokenStart;
	    		boolean insertSpace = previousToken == TerminalTokens.TokenNameWHITESPACE || (tokenStart == textStart && this.column > firstColumn && !(firstText || isHtmlTag));
	    		int lastColumn = this.column + tokensBuffer.length() + tokenLength;
	    		if (insertSpace) lastColumn++;
	    		int col = column; 
	    		if (headerLine) {
	    			// special case when text is on the same line of the javadoc's header
	    			if (lastColumn > maxColumn)  {
	    				lastColumn--; // new line gives an extra character
	    				this.lastNumberOfNewLines++; // in case we leave just after
	    			}
	    		}
				if (lastColumn > maxColumn) {
					// not enough space on the line
					if (lastColumn == this.column) this.lastNumberOfNewLines++;
			    	buffer.append(this.lineSeparator);
			    	this.column = 1;
			    	printIndentationIfNecessary(buffer);

			    	if (indentationBuffer != null) {
			    		buffer.append(indentationBuffer);
			    	}
			    	if (tokensBuffer.length() > 0) {
			    		String tokensString = tokensBuffer.toString().trim();
						buffer.append(tokensString);
						this.column += tokensString.length();
						tokensBuffer.setLength(0);
			    	}
					buffer.append(this.scanner.source, tokenStart, tokenLength);
					this.column += tokenLength;
					if (headerLine) {
						firstColumn--;

					}
    			} else {
					// append token to the line
		    		if (insertSpace) {
		    			tokensBuffer.append(' ');
		    		}
					tokensBuffer.append(this.scanner.source, tokenStart, tokenLength);
    			}
				previousToken = token;
    		}
		}
		finally {
			this.scanner.skipComments = false;
			// Add remaining buffered tokens
			if (tokensBuffer.length() > 0) {
				buffer.append(tokensBuffer);
				this.column += tokensBuffer.length();
			}
		}
    }




 * @see org.eclipse.jdt.internal.compiler.parser.JavadocParser#createMethodReference(java.lang.Object, java.util.List)
 */
protected Object createMethodReference(Object receiver, List arguments) throws InvalidInputException {

	// Get intermediate arguments positions
	long[] positions = null;
	if (arguments != null) {
		int size = arguments.size();
		positions = new long[size];
		for (int i=0; i<size; i++) {
			FormatJavadocReference reference = (FormatJavadocReference) arguments.get(i);
			positions[i] = (((long) reference.sourceStart) << 32) + reference.sourceEnd;
		}
	}

	// Build the node
	int start = receiver == null ? this.memberStart : ((FormatJavadocReference) receiver).sourceStart;
	int lineStart = this.scanner.getLineNumber(start);
	return new FormatJavadocReference(start, this.scanner.getCurrentTokenEndPosition(), lineStart);
	reference.positions = positions;
	return reference;
}

/* (non-Javadoc)
 * @see org.eclipse.jdt.internal.compiler.parser.JavadocParser#createTag()
 */
protected void createTag() {
//	if (this.tagValue == TAG_OTHERS_VALUE)  {
//		if (this.textStart == -1) this.textStart = this.tagSourceStart;
//		return;
//	}
	int lineStart = this.scanner.getLineNumber(this.tagSourceStart);
	FormatJavadocBlock block = new FormatJavadocBlock(this.tagSourceStart, this.tagSourceEnd, lineStart, this.tagValue);
	if (this.inlineTagStarted) {

	}
	long[] positions = new long[size];
	System.arraycopy(this.identifierPositionStack, this.identifierPtr - size + 1, positions, 0, size);
	return new FormatJavadocReference((int) (positions[0] >>> 32), (int) positions[positions.length-1], lineStart);
}

/*

	if (!valid) {
		this.scanner.resetTo(this.tagSourceEnd+1, this.javadocEnd);
		this.index = this.tagSourceEnd+1;
//		char ch = peekChar();
//		if (ch != ' ' && !ScannerHelper.isWhitespace(ch)) {
//			// no space after the tag, just create a normal tag
//			return false;
//		}
//		this.scanner.getNextToken(); // consume first token
//		pushIdentifier(true, false); // force the identifier even if invalid
//		pushSeeRef(createTypeReference(0));
//		this.index = this.scanner.currentPosition;
//		valid = true;
	}
	return valid;
}

	int start = (int) (this.identifierPositionStack[0] >>> 32);
	int lineStart = this.scanner.getLineNumber(start);
	FormatJavadocReference reference;
	reference = new FormatJavadocReference(start, (int) this.identifierPositionStack[isTypeParam ? 2 : 0], lineStart);
		reference = new FormatJavadocReference(start, (int) this.identifierPositionStack[2], lineStart);
		reference.positions = new long[3];
		System.arraycopy(this.identifierPositionStack, 0, reference.positions, 0, 3);
	} else {
		reference = new FormatJavadocReference(start, (int) this.identifierPositionStack[0], lineStart);
	}
	block.reference = reference;
	block.sourceEnd = reference.sourceEnd;
	pushOnAstStack(block, true);

		} else {
			// If last fragment is a tag, then use it as previous tag
			FormatJavadocNode lastNode = previousBlock.nodes[previousBlock.nodesPtr];
			while (lastNode != null && lastNode.isText()) {
				lastNode = lastNode.getLastNode();
			}
			if (lastNode != null) {
				previousBlock = (FormatJavadocBlock) lastNode;
				previousStart = previousBlock.sourceStart;
			}

Lines 28-33 Link Here

(-)formatter/org/eclipse/jdt/internal/formatter/FormatJavadocBlock.java (-9 / +16 lines)
28	final static int ON_HEADER_LINE = 0x0004;	28	final static int ON_HEADER_LINE = 0x0004;
29	final static int TEXT_ON_TAG_LINE = 0x0008;	29	final static int TEXT_ON_TAG_LINE = 0x0008;
30	final static int ONE_LINE_TAG = 0x0010;	30	final static int ONE_LINE_TAG = 0x0010;
		31	final static int PARAM_TAG = 0x0020;
31		32
32	// constants	33	// constants
33	final static int MAX_TAG_HIERARCHY = 10;	34	final static int MAX_TAG_HIERARCHY = 10;
Lines 43-48 Link Here
43	super(start, end, line);	44	super(start, end, line);
44	this.tagValue = value;	45	this.tagValue = value;
45	this.tagEnd = end;	46	this.tagEnd = end;
		47	switch (value) {
		48	case TAG_PARAM_VALUE:
		49	// TODO why are following tags considered like @param by the formatter?
		50	case TAG_SERIAL_FIELD_VALUE:
		51	case TAG_THROWS_VALUE:
		52	case TAG_EXCEPTION_VALUE:
		53	flags \|= PARAM_TAG;
		54	}
46	}	55	}
47		56
48	private void addNode(FormatJavadocNode node) {	57	private void addNode(FormatJavadocNode node) {
Lines 72-82 Link Here
72	textHierarchy[i].sourceEnd = block.sourceEnd;	81	textHierarchy[i].sourceEnd = block.sourceEnd;
73	}	82	}
74	this.sourceEnd = block.sourceEnd;	83	this.sourceEnd = block.sourceEnd;
		84	if (isParamTag()) {
		85	block.flags \|= PARAM_TAG;
		86	}
75	return;	87	return;
76	}	88	}
77	}	89	}
78	}	90	}
79	addNode(block);	91	addNode(block);
		92	if (isParamTag()) {
		93	block.flags \|= PARAM_TAG;
		94	}
80	}	95	}
81		96
82	void addText(FormatJavadocText text) {	97	void addText(FormatJavadocText text) {
Lines 264-278 Link Here
264	* <code>false</code> otherwise.	279	* <code>false</code> otherwise.
265	*/	280	*/
266	public boolean isParamTag() {	281	public boolean isParamTag() {
267	switch (this.tagValue) {	282	return (this.flags & PARAM_TAG) == PARAM_TAG;
268	case TAG_PARAM_VALUE:
269	// TODO (eric) why are following tags considered like @param by the formatter?
270	case TAG_SERIAL_FIELD_VALUE:
271	case TAG_THROWS_VALUE:
272	case TAG_EXCEPTION_VALUE:
273	return true;
274	}
275	return false;
276	}	283	}
277		284
278	protected void toString(StringBuffer buffer) {	285	protected void toString(StringBuffer buffer) {




 * </p>
 */
public class FormatJavadocReference extends FormatJavadocNode {
	long[] positions; // positions of separators ('.') for qualified references

public FormatJavadocReference(int start, int end, int line) {
	super(start, end, line);

	super((int) (position >>> 32), (int) position, line);
}

public FormatJavadocReference(long[] positions, int line) {
	super((int) (positions[0] >>> 32), (int) positions[positions.length-1], line);
	this.positions = positions;
}

void clean() {
	// Clean positions when used
}

Lines 132-144 Link Here

(-)src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsMassiveTests.java (-4 / +4 lines)
132	* <ul>	132	* <ul>
133	* <li>3.0 performance workspace (9951 units):<ul>	133	* <li>3.0 performance workspace (9951 units):<ul>
134	* <li>0 error</li>	134	* <li>0 error</li>
135	* <li>199 failures</li>	135	* <li>104 failures</li>
136	* <li>751 different lines leading spaces</li>	136	* <li>799 different lines leading spaces</li>
137	* </ul></li>	137	* </ul></li>
138	* <li>ganymede workspace (25819 units):<ul>	138	* <li>ganymede workspace (25819 units):<ul>
139	* <li>0 error</li>	139	* <li>0 error</li>
140	* <li>376 failures</li>	140	* <li>202 failures</li>
141	* <li>1350 different lines leading spaces</li>	141	* <li>1410 different lines leading spaces</li>
142	* </ul></li>	142	* </ul></li>
143	* </ul>	143	* </ul>
144	*	144	*

Lines 688-693 Link Here

(-)src/org/eclipse/jdt/core/tests/formatter/FormatterCommentsTests.java (+59 lines)
688	public void testTagParam04() throws JavaModelException {	688	public void testTagParam04() throws JavaModelException {
689	formatUnit("tags.param", "X04.java");	689	formatUnit("tags.param", "X04.java");
690	}	690	}
		691	public void testTagParam05() throws JavaModelException {
		692	formatUnit("tags.param", "X05.java");
		693	}
		694	public void testTagParam06() throws JavaModelException {
		695	formatUnit("tags.param", "X06.java");
		696	}
691		697
692	/*	698	/*
693	* Test formatter see tags	699	* Test formatter see tags
Lines 701-706 Link Here
701	public void testTagSee03() throws JavaModelException {	707	public void testTagSee03() throws JavaModelException {
702	formatUnit("tags.see", "X03.java");	708	formatUnit("tags.see", "X03.java");
703	}	709	}
		710	public void testTagSee04() throws JavaModelException {
		711	formatUnit("tags.see", "X04.java");
		712	}
		713	public void testTagSee05() throws JavaModelException {
		714	formatUnit("tags.see", "X05.java");
		715	}
		716	public void testTagSee06() throws JavaModelException {
		717	formatUnit("tags.see", "X06.java");
		718	}
704		719
705	/*	720	/*
706	* Test formatter see tags	721	* Test formatter see tags
Lines 803-808 Link Here
803	public void testBlockComments10() throws JavaModelException {	818	public void testBlockComments10() throws JavaModelException {
804	formatUnit("comments.block", "X10.java");	819	formatUnit("comments.block", "X10.java");
805	}	820	}
		821	public void testBlockComments11() throws JavaModelException {
		822	formatUnit("comments.block", "X11.java");
		823	}
806		824
807	/*	825	/*
808	* Test formatter on example got from workspaces	826	* Test formatter on example got from workspaces
Lines 869-876 Link Here
869	public void testWkspEclipse13() throws JavaModelException {	887	public void testWkspEclipse13() throws JavaModelException {
870	formatUnit("wksp.eclipse", "X13.java");	888	formatUnit("wksp.eclipse", "X13.java");
871	}	889	}
		890	public void testWkspEclipse14() throws JavaModelException {
		891	formatUnit("wksp.eclipse", "X14.java");
		892	}
872	// JUnit 3.8.2	893	// JUnit 3.8.2
873	public void testWkspJUnit01() throws JavaModelException {	894	public void testWkspJUnit01() throws JavaModelException {
874	formatUnit("wksp.junit", "X01.java");	895	formatUnit("wksp.junit", "X01.java");
875	}	896	}
		897
		898	/**
		899	* @bug 228652: [formatter] New line inserted while formatting a region of a compilation unit.
		900	* @test Insure that no new line is inserted before the formatted region
		901	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=228652"
		902	*/
		903	// TODO (frederic) See https://bugs.eclipse.org/bugs/show_bug.cgi?id=49187
		904	public void _testBug228652() {
		905	String input =
		906	"package a;\r\n" +
		907	"\r\n" +
		908	"public class Test {\r\n" +
		909	"\r\n" +
		910	" private int field;\r\n" +
		911	" \r\n" +
		912	" /**\r\n" +
		913	" * fds \r\n" +
		914	" */\r\n" +
		915	" public void foo() {\r\n" +
		916	" }\r\n" +
		917	"}";
		918
		919	String expected =
		920	"package a;\r\n" +
		921	"\r\n" +
		922	"public class Test {\r\n" +
		923	"\r\n" +
		924	" private int field;\r\n" +
		925	" \r\n" +
		926	" /**\r\n" +
		927	" * fds\r\n" +
		928	" */\r\n" +
		929	" public void foo() {\r\n" +
		930	" }\r\n" +
		931	"}";
		932
		933	formatSource(input, expected, CodeFormatter.K_COMPILATION_UNIT \| CodeFormatter.F_INCLUDE_COMMENTS, 0, false, 62, 19, null);
		934	}
876	}	935	}

Lines 6-12 Link Here

(-)workspace/FormatterJavadoc/test/wksp/eclipse/out/clear_blank_lines/X01.java (-1 / +2 lines)
6	*	6	*
7	* @see {@link PropertyPage}	7	* @see {@link PropertyPage}
8	* @see {@link ILaunchConfiguration}	8	* @see {@link ILaunchConfiguration}
9	* @see {@link org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog}	9	* @see {@link org.eclipse.debug.internal.ui.launchConfigurations.
		10	* LaunchConfigurationsDialog}
10	* @see {@link IDebugHelpContextIds#DEFAULT_LAUNCHCONFIGURATION_PROPERTY_PAGE}	11	* @see {@link IDebugHelpContextIds#DEFAULT_LAUNCHCONFIGURATION_PROPERTY_PAGE}
11	* CONTEXTLAUNCHING	12	* CONTEXTLAUNCHING
12	* @since 3.3.0	13	* @since 3.3.0

Lines 8-15 Link Here

(-)workspace/FormatterJavadoc/test/tags/see/out/dont_indent_tags/X03.java (-2 / +2 lines)
8	}	8	}
9		9
10	/**	10	/**
11	* @see X03 Simple type reference (there's no desciption before this section	11	* @see X03 Simple type reference (there's no desciption before this
12	* !)	12	* section!)
13	* @see X03.Y03.Z03 Qualified field reference (extended description to have	13	* @see X03.Y03.Z03 Qualified field reference (extended description to have
14	* it on two lines after the formatting...)	14	* it on two lines after the formatting...)
15	* @see test.tags.see.X03.Y03 Fully qualified field reference	15	* @see test.tags.see.X03.Y03 Fully qualified field reference

Lines 6-13 Link Here

(-)workspace/FormatterJavadoc/test/comments/block/out/default/X08.java (-2 / +2 lines)
6	if (true) {	6	if (true) {
7	if (true) {	7	if (true) {
8	if (condition /*	8	if (condition /*
9	* && useChange(d.fDirection) && !d.	9	* && useChange(d.fDirection) &&
10	* fIsWhitespace	10	* !d.fIsWhitespace
11	*/) {	11	*/) {
12	}	12	}
13	}	13	}




 * this list of conditions and the following disclaimer.
 * 
 * 2. Redistributions in binary form must reproduce the above copyright notice,
 * this list of conditions and the following disclaimer in the documentation
 * and/or other materials provided with the distribution.
 * 
 * 3. The end-user documentation included with the redistribution, if any, must
 * include the following acknowledgment: "This product includes software

 * OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
 * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
 * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
 * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * ====================================================================
 * 
 * This software consists of voluntary contributions made by many individuals on
 * behalf of the Apache Software Foundation. For more information on the Apache

Lines 6-13 Link Here

(-)workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_descr/X02.java (-2 / +2 lines)
6	* will remove the charset setting for this resource.	6	* will remove the charset setting for this resource.
7	* <p>	7	* <p>
8	* This method changes resources; these changes will be reported in a	8	* This method changes resources; these changes will be reported in a
9	* subsequent resource change event, including an indication that this file'	9	* subsequent resource change event, including an indication that this
10	* s encoding has changed.	10	* file's encoding has changed.
11	* </p>	11	* </p>
12	* <p>	12	* <p>
13	* This method is long-running; progress and cancellation are provided by	13	* This method is long-running; progress and cancellation are provided by




 * end-user documentation included with the redistribution, if any, must include
 * the following acknowledgment: "This product includes software developed by
 * the Apache Software Foundation (http://www.apache.org/)." Alternately, this
 * acknowledgment may appear in the software itself, if and wherever such
 * third-party acknowledgments normally appear. 4. The names "Apache" and
 * "Apache Software Foundation" and "Apache Lucene" must not be used to endorse
 * or promote products derived from this software without prior written
 * permission. For written permission, please contact apache@apache.org. 5.

 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * ==================================================================== This
 * software consists of voluntary contributions made by many individuals on
 * behalf of the Apache Software Foundation. For more information on the Apache
 * Software Foundation, please see <http://www.apache.org/>.
 */
class Y05 {
}




 * end-user documentation included with the redistribution, if any, must include
 * the following acknowledgment: "This product includes software developed by
 * the Apache Software Foundation (http://www.apache.org/)." Alternately, this
 * acknowledgment may appear in the software itself, if and wherever such
 * third-party acknowledgments normally appear. 4. The names "Apache" and
 * "Apache Software Foundation" and "Apache Lucene" must not be used to endorse
 * or promote products derived from this software without prior written
 * permission. For written permission, please contact apache@apache.org. 5.

 * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
 * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
 * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * ==================================================================== This
 * software consists of voluntary contributions made by many individuals on
 * behalf of the Apache Software Foundation. For more information on the Apache
 * Software Foundation, please see <http://www.apache.org/>.
 */
public class X05 {





		String result=testFormat(input, options);
		assertEquals(expected, result);
	}

	/**
	 * @bug 228652: [formatter] New line inserted while formatting a region of a compilation unit.
	 * @test Insure that no new line is inserted before the formatted region
	 * @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=228652"
	 */
	public void testBug228652() {
		Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();

		String input =
				"package a;\r\n" + 
				"\r\n" + 
				"public class Test {\r\n" + 
				"\r\n" + 
				"	private int field;\r\n" + 
				"	\r\n" + 
				"	/**\r\n" + 
				"	 * fds \r\n" + 
				"	 */\r\n" + 
				"	public void foo() {\r\n" + 
				"	}\r\n" + 
				"}";

		String expected =
				"package a;\r\n" + 
				"\r\n" + 
				"public class Test {\r\n" + 
				"\r\n" + 
				"	private int field;\r\n" + 
				"	\r\n" + 
				"	/**\r\n" + 
				"	 * fds\r\n" + 
				"	 */\r\n" + 
				"	public void foo() {\r\n" + 
				"	}\r\n" + 
				"}";
		
		String result = testFormat(input, 62, 19, CodeFormatter.K_JAVA_DOC, options);
		assertEquals(expected, result);
	}
}

Lines 6-12 Link Here

(-)workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X01.java (-1 / +2 lines)
6	*	6	*
7	* @see {@link PropertyPage}	7	* @see {@link PropertyPage}
8	* @see {@link ILaunchConfiguration}	8	* @see {@link ILaunchConfiguration}
9	* @see {@link org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog}	9	* @see {@link
		10	* org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog}
10	* @see {@link IDebugHelpContextIds#DEFAULT_LAUNCHCONFIGURATION_PROPERTY_PAGE}	11	* @see {@link IDebugHelpContextIds#DEFAULT_LAUNCHCONFIGURATION_PROPERTY_PAGE}
11	*	12	*
12	* CONTEXTLAUNCHING	13	* CONTEXTLAUNCHING

Lines 6-13 Link Here

(-)workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X02.java (-2 / +2 lines)
6	* will remove the charset setting for this resource.	6	* will remove the charset setting for this resource.
7	* <p>	7	* <p>
8	* This method changes resources; these changes will be reported in a	8	* This method changes resources; these changes will be reported in a
9	* subsequent resource change event, including an indication that this file'	9	* subsequent resource change event, including an indication that this
10	* s encoding has changed.	10	* file's encoding has changed.
11	* </p>	11	* </p>
12	* <p>	12	* <p>
13	* This method is long-running; progress and cancellation are provided by	13	* This method is long-running; progress and cancellation are provided by




 * <code>isSaveNeeded</code> . The value <code>true</code> triggers a subsequent
 * call to <code>save</code> where the modified resources can be saved.
 * <p>
 * The most important part of this implementation is the setup of the
 * compare/merge UI. The UI uses a simple browser metaphor to present compare
 * results. The top half of the layout shows the structural compare results
 * (e.g. added, deleted, and changed files), the bottom half the content compare
 * results (e.g. textual differences between two files). A selection in the top
 * pane is fed to the bottom pane. If a content viewer is registered for the
 * type of the selected object, this viewer is installed in the pane. In
 * addition if a structure viewer is registered for the selection type the top
 * pane is split horizontally to make room for another pane and the structure
 * viewer is installed in it. When comparing Java files this second structure
 * viewer would show the structural differences within a Java file, e.g. added,
 * deleted or changed methods and fields.
 * <p>
 * Subclasses provide custom setups, e.g. for a Catchup/Release operation by
 * passing a subclass of <code>CompareConfiguration</code> and by implementing

Lines 6-12 Link Here

(-)workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X01.java (-1 / +2 lines)
6	*	6	*
7	* @see {@link PropertyPage}	7	* @see {@link PropertyPage}
8	* @see {@link ILaunchConfiguration}	8	* @see {@link ILaunchConfiguration}
9	* @see {@link org.eclipse.debug.internal.ui.launchConfigurations.LaunchConfigurationsDialog}	9	* @see {@link org.eclipse.debug.internal.ui.launchConfigurations.
		10	* LaunchConfigurationsDialog}
10	* @see {@link IDebugHelpContextIds#DEFAULT_LAUNCHCONFIGURATION_PROPERTY_PAGE}	11	* @see {@link IDebugHelpContextIds#DEFAULT_LAUNCHCONFIGURATION_PROPERTY_PAGE}
11	*	12	*
12	* CONTEXTLAUNCHING	13	* CONTEXTLAUNCHING

Lines 6-13 Link Here

(-)workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X02.java (-2 / +2 lines)
6	* will remove the charset setting for this resource.	6	* will remove the charset setting for this resource.
7	* <p>	7	* <p>
8	* This method changes resources; these changes will be reported in a	8	* This method changes resources; these changes will be reported in a
9	* subsequent resource change event, including an indication that this file'	9	* subsequent resource change event, including an indication that this
10	* s encoding has changed.	10	* file's encoding has changed.
11	* </p>	11	* </p>
12	* <p>	12	* <p>
13	* This method is long-running; progress and cancellation are provided by	13	* This method is long-running; progress and cancellation are provided by

Lines 8-15 Link Here

(-)workspace/FormatterJavadoc/test/tags/see/out/default/X03.java (-2 / +2 lines)
8	}	8	}
9		9
10	/**	10	/**
11	* @see X03 Simple type reference (there's no desciption before this section	11	* @see X03 Simple type reference (there's no desciption before this
12	* !)	12	* section!)
13	* @see X03.Y03.Z03 Qualified field reference (extended description to have	13	* @see X03.Y03.Z03 Qualified field reference (extended description to have
14	* it on two lines after the formatting...)	14	* it on two lines after the formatting...)
15	* @see test.tags.see.X03.Y03 Fully qualified field reference	15	* @see test.tags.see.X03.Y03 Fully qualified field reference




package test.tags.param;

public class X06 {
	/**
	 * Returns a collection of projects referenced by a build scope attribute.
	 * 
	 * @param scope
	 * 	build scope attribute (<code>ATTR_BUILD_SCOPE</code>)
	 * @return collection of porjects referred to by the scope attribute
	 */
	int foo() {
		return 0;
	}
}

Added Link Here

(-)workspace/FormatterJavadoc/test/tags/see/out/dont_indent_tags/X06.java (+11 lines)
1	package test.tags.see;
2
3	public class X06 {
4
5	/**
6	* @see org.xml.sax.ext.DeclHandler#externalEntityDecl(java.lang.String,
7	* java.lang.String, java.lang.String)
8	*/
9	void foo() {
10	}
11	}




package test.wksp.eclipse;

public class X14 {

	/**
	 * Returns an open input stream on the contents of the specified help
	 * resource. The client is responsible for closing the stream when finished.
	 * 
	 * @param href
	 * the URL (as a string) of the help resource
	 * <p>
	 * Valid href are as described in {@link
	 * org.eclipse.help.IHelpResource#getHref IHelpResource.getHref}
	 * </p>
	 * @return an input stream containing the contents of the help resource, or
	 * <code>null</code> if the help resource could not be found and opened
	 */
	int foo(String href) {
		return 0;
	}
}

Added Link Here

(-)workspace/FormatterJavadoc/test/comments/block/X11.java (+11 lines)
1	package test.comments.block;
2
3	public class X11 {
4
5	public X11() {
6	this(false /comment/, false /whitespace/, false /nls/, 0 /sourceLevel/, null/taskTag/, null/taskPriorities/, true /taskCaseSensitive/);
7	}
8
9	public X11(boolean b, boolean c, boolean d, int i, Object object, Object object2, boolean e) {
10	}
11	}

Added Link Here

(-)workspace/FormatterJavadoc/test/tags/see/X04.java (+11 lines)
1	package test.tags.see;
2
3	public class X04 {
4
5	/**
6	* When a preference changes, update the in-memory cache of the preference.
7	* @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
8	*/
9	void foo() {
10	}
11	}




package test.wksp.eclipse;

public class X14 {

	/**
	 * Returns an open input stream on the contents of the specified help
	 * resource. The client is responsible for closing the stream when finished.
	 * 
	 * @param href
	 * 	the URL (as a string) of the help resource
	 * 	<p>
	 * 	Valid href are as described in {@link
	 * 	org.eclipse.help.IHelpResource#getHref IHelpResource.getHref}
	 * 	</p>
	 * @return an input stream containing the contents of the help resource, or
	 * 	<code>null</code> if the help resource could not be found and opened
	 */
	int foo(String href) {
		return 0;
	}
}




package test.tags.param;

public class X05 {
	/**
	 * Test with exception tag.
	 * 
	 * @exception Throwable
	 * if any exception is thrown
	 */
	public void foo() throws Throwable {
	}
}




package test.comments.block;

public class X11 {

	public X11() {
		this(false /* comment */, false /* whitespace */, false /* nls */,
				0 /* sourceLevel */, null/* taskTag */,
				null/* taskPriorities */, true /* taskCaseSensitive */);
	}

	public X11(boolean b, boolean c, boolean d, int i, Object object,
			Object object2, boolean e) {
	}
}




package test.tags.see;

public class X05 {

	class Y05 {
		/**
		 * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String,
		 * java.lang.String)
		 */
		void foo() {
		}
	}
}




package test.tags.see;

public class X04 {

	/**
	 * When a preference changes, update the in-memory cache of the preference.
	 * 
	 * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#
	 * 	propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
	 */
	void foo() {
	}
}

Added Link Here

(-)workspace/FormatterJavadoc/test/tags/see/out/default/X06.java (+11 lines)
1	package test.tags.see;
2
3	public class X06 {
4
5	/**
6	* @see org.xml.sax.ext.DeclHandler#externalEntityDecl(java.lang.String,
7	* java.lang.String, java.lang.String)
8	*/
9	void foo() {
10	}
11	}




package test.wksp.eclipse;

public class X14 {

	/**
	 * Returns an open input stream on the contents of the specified help
	 * resource. The client is responsible for closing the stream when finished.
	 * 
	 * @param href
	 * 		the URL (as a string) of the help resource
	 * 		<p>
	 * 		Valid href are as described in {@link
	 * 		org.eclipse.help.IHelpResource#getHref IHelpResource.getHref}
	 * 		</p>
	 * @return an input stream containing the contents of the help resource, or
	 * 	<code>null</code> if the help resource could not be found and opened
	 */
	int foo(String href) {
		return 0;
	}
}




package test.tags.see;

public class X04 {

	/**
	 * When a preference changes, update the in-memory cache of the preference.
	 * 
	 * @see org.eclipse.core.runtime.Preferences.IPropertyChangeListener#
	 * propertyChange(org.eclipse.core.runtime.Preferences.PropertyChangeEvent)
	 */
	void foo() {
	}
}




package test.tags.see;

public class X05 {

	class Y05 {
		/**
		 * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String, java.lang.String)
		 */
		void foo() {
		}
	}
}




package test.tags.param;

public class X06 {
	/**
	 * Returns a collection of projects referenced by a build scope attribute.
	 * 
	 * @param scope
	 * build scope attribute (<code>ATTR_BUILD_SCOPE</code>)
	 * @return collection of porjects referred to by the scope attribute
	 */
	int foo() {
		return 0;
	}
}

Added Link Here

(-)workspace/FormatterJavadoc/test/tags/see/X06.java (+10 lines)
1	package test.tags.see;
2
3	public class X06 {
4
5	/**
6	* @see org.xml.sax.ext.DeclHandler#externalEntityDecl(java.lang.String, java.lang.String, java.lang.String)
7	*/
8	void foo() {
9	}
10	}




package test.tags.param;

public class X05 {
	/**
	 * Test with exception tag.
	 * 
	 * @exception Throwable
	 * 	if any exception is thrown
	 */
	public void foo() throws Throwable {
	}
}




package test.wksp.eclipse;

public class X14 {

	/**
	 * Returns an open input stream on the contents of the specified help
	 * resource. The client is responsible for closing the stream when finished.
	 * 
	 * @param href
	 *            the URL (as a string) of the help resource
	 *            <p>
	 *            Valid href are as described in
	 *            {@link  org.eclipse.help.IHelpResource#getHref IHelpResource.getHref}
	 *            </p>
	 * @return an input stream containing the contents of the help resource, or
	 *         <code>null</code> if the help resource could not be found and
	 *         opened
	 */
	int foo(String href) {
		return 0;
	}
}




package test.tags.see;

public class X05 {

	class Y05 {
		/**
		 * @see org.xml.sax.EntityResolver#resolveEntity(java.lang.String,
		 * 	java.lang.String)
		 */
		void foo() {
		}
	}
}

Return to bug 227043

Lines 935-938 Link Here

(-)src/org/eclipse/jdt/core/tests/formatter/comment/JavaDocTestCase.java (+40 lines)
935	String result=testFormat(input, options);	935	String result=testFormat(input, options);
936	assertEquals(expected, result);	936	assertEquals(expected, result);
937	}	937	}
		938
		939	/**
		940	* @bug 228652: [formatter] New line inserted while formatting a region of a compilation unit.
		941	* @test Insure that no new line is inserted before the formatted region
		942	* @see "https://bugs.eclipse.org/bugs/show_bug.cgi?id=228652"
		943	*/
		944	public void testBug228652() {
		945	Map options = DefaultCodeFormatterConstants.getEclipseDefaultSettings();
		946
		947	String input =
		948	"package a;\r\n" +
		949	"\r\n" +
		950	"public class Test {\r\n" +
		951	"\r\n" +
		952	" private int field;\r\n" +
		953	" \r\n" +
		954	" /**\r\n" +
		955	" * fds \r\n" +
		956	" */\r\n" +
		957	" public void foo() {\r\n" +
		958	" }\r\n" +
		959	"}";
		960
		961	String expected =
		962	"package a;\r\n" +
		963	"\r\n" +
		964	"public class Test {\r\n" +
		965	"\r\n" +
		966	" private int field;\r\n" +
		967	" \r\n" +
		968	" /**\r\n" +
		969	" * fds\r\n" +
		970	" */\r\n" +
		971	" public void foo() {\r\n" +
		972	" }\r\n" +
		973	"}";
		974
		975	String result = testFormat(input, 62, 19, CodeFormatter.K_JAVA_DOC, options);
		976	assertEquals(expected, result);
		977	}
938	}	978	}

Lines 72-105 Link Here

(-)formatter/org/eclipse/jdt/internal/formatter/FormatterCommentParser.java (-39 / +7 lines)
72	* @see org.eclipse.jdt.internal.compiler.parser.JavadocParser#createMethodReference(java.lang.Object, java.util.List)	72	* @see org.eclipse.jdt.internal.compiler.parser.JavadocParser#createMethodReference(java.lang.Object, java.util.List)
73	*/	73	*/
74	protected Object createMethodReference(Object receiver, List arguments) throws InvalidInputException {	74	protected Object createMethodReference(Object receiver, List arguments) throws InvalidInputException {
75
76	// Get intermediate arguments positions
77	long[] positions = null;
78	if (arguments != null) {
79	int size = arguments.size();
80	positions = new long[size];
81	for (int i=0; i<size; i++) {
82	FormatJavadocReference reference = (FormatJavadocReference) arguments.get(i);
83	positions[i] = (((long) reference.sourceStart) << 32) + reference.sourceEnd;
84	}
85	}
86
87	// Build the node
88	int start = receiver == null ? this.memberStart : ((FormatJavadocReference) receiver).sourceStart;	75	int start = receiver == null ? this.memberStart : ((FormatJavadocReference) receiver).sourceStart;
89	int lineStart = this.scanner.getLineNumber(start);	76	int lineStart = this.scanner.getLineNumber(start);
90	FormatJavadocReference reference = new FormatJavadocReference(start, this.scanner.getCurrentTokenEndPosition(), lineStart);	77	return new FormatJavadocReference(start, this.scanner.getCurrentTokenEndPosition(), lineStart);
91	reference.positions = positions;
92	return reference;
93	}	78	}
94		79
95	/* (non-Javadoc)	80	/* (non-Javadoc)
96	* @see org.eclipse.jdt.internal.compiler.parser.JavadocParser#createTag()	81	* @see org.eclipse.jdt.internal.compiler.parser.JavadocParser#createTag()
97	*/	82	*/
98	protected void createTag() {	83	protected void createTag() {
99	// if (this.tagValue == TAG_OTHERS_VALUE) {
100	// if (this.textStart == -1) this.textStart = this.tagSourceStart;
101	// return;
102	// }
103	int lineStart = this.scanner.getLineNumber(this.tagSourceStart);	84	int lineStart = this.scanner.getLineNumber(this.tagSourceStart);
104	FormatJavadocBlock block = new FormatJavadocBlock(this.tagSourceStart, this.tagSourceEnd, lineStart, this.tagValue);	85	FormatJavadocBlock block = new FormatJavadocBlock(this.tagSourceStart, this.tagSourceEnd, lineStart, this.tagValue);
105	if (this.inlineTagStarted) {	86	if (this.inlineTagStarted) {
Lines 129-135 Link Here
129	}	110	}
130	long[] positions = new long[size];	111	long[] positions = new long[size];
131	System.arraycopy(this.identifierPositionStack, this.identifierPtr - size + 1, positions, 0, size);	112	System.arraycopy(this.identifierPositionStack, this.identifierPtr - size + 1, positions, 0, size);
132	return new FormatJavadocReference(positions, lineStart);	113	return new FormatJavadocReference((int) (positions[0] >>> 32), (int) positions[positions.length-1], lineStart);
133	}	114	}
134		115
135	/*	116	/*
Lines 293-308 Link Here
293	if (!valid) {	274	if (!valid) {
294	this.scanner.resetTo(this.tagSourceEnd+1, this.javadocEnd);	275	this.scanner.resetTo(this.tagSourceEnd+1, this.javadocEnd);
295	this.index = this.tagSourceEnd+1;	276	this.index = this.tagSourceEnd+1;
296	// char ch = peekChar();
297	// if (ch != ' ' && !ScannerHelper.isWhitespace(ch)) {
298	// // no space after the tag, just create a normal tag
299	// return false;
300	// }
301	// this.scanner.getNextToken(); // consume first token
302	// pushIdentifier(true, false); // force the identifier even if invalid
303	// pushSeeRef(createTypeReference(0));
304	// this.index = this.scanner.currentPosition;
305	// valid = true;
306	}	277	}
307	return valid;	278	return valid;
308	}	279	}
Lines 346-358 Link Here
346	int start = (int) (this.identifierPositionStack[0] >>> 32);	317	int start = (int) (this.identifierPositionStack[0] >>> 32);
347	int lineStart = this.scanner.getLineNumber(start);	318	int lineStart = this.scanner.getLineNumber(start);
348	FormatJavadocReference reference;	319	FormatJavadocReference reference;
349	if (isTypeParam) {	320	reference = new FormatJavadocReference(start, (int) this.identifierPositionStack[isTypeParam ? 2 : 0], lineStart);
350	reference = new FormatJavadocReference(start, (int) this.identifierPositionStack[2], lineStart);
351	reference.positions = new long[3];
352	System.arraycopy(this.identifierPositionStack, 0, reference.positions, 0, 3);
353	} else {
354	reference = new FormatJavadocReference(start, (int) this.identifierPositionStack[0], lineStart);
355	}
356	block.reference = reference;	321	block.reference = reference;
357	block.sourceEnd = reference.sourceEnd;	322	block.sourceEnd = reference.sourceEnd;
358	pushOnAstStack(block, true);	323	pushOnAstStack(block, true);
Lines 416-422 Link Here
416	} else {	381	} else {
417	// If last fragment is a tag, then use it as previous tag	382	// If last fragment is a tag, then use it as previous tag
418	FormatJavadocNode lastNode = previousBlock.nodes[previousBlock.nodesPtr];	383	FormatJavadocNode lastNode = previousBlock.nodes[previousBlock.nodesPtr];
419	if (!lastNode.isText()) {	384	while (lastNode != null && lastNode.isText()) {
		385	lastNode = lastNode.getLastNode();
		386	}
		387	if (lastNode != null) {
420	previousBlock = (FormatJavadocBlock) lastNode;	388	previousBlock = (FormatJavadocBlock) lastNode;
421	previousStart = previousBlock.sourceStart;	389	previousStart = previousBlock.sourceStart;
422	}	390	}

Lines 17-24 Link Here

(-)workspace/FormatterJavadoc/test/comments/block/out/default/X05e.java (-4 / +4 lines)
17	* this list of conditions and the following disclaimer.	17	* this list of conditions and the following disclaimer.
18	*	18	*
19	* 2. Redistributions in binary form must reproduce the above copyright notice,	19	* 2. Redistributions in binary form must reproduce the above copyright notice,
20	* this list of conditions and the following disclaimer in the documentation and	20	* this list of conditions and the following disclaimer in the documentation
21	* /or other materials provided with the distribution.	21	* and/or other materials provided with the distribution.
22	*	22	*
23	* 3. The end-user documentation included with the redistribution, if any, must	23	* 3. The end-user documentation included with the redistribution, if any, must
24	* include the following acknowledgment: "This product includes software	24	* include the following acknowledgment: "This product includes software
Lines 44-51 Link Here
44	* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF	44	* OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
45	* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING	45	* LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
46	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,	46	* NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
47	* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==========================	47	* EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
48	* ==========================================	48	* ====================================================================
49	*	49	*
50	* This software consists of voluntary contributions made by many individuals on	50	* This software consists of voluntary contributions made by many individuals on
51	* behalf of the Apache Software Foundation. For more information on the Apache	51	* behalf of the Apache Software Foundation. For more information on the Apache

Lines 17-24 Link Here

(-)workspace/FormatterJavadoc/test/comments/block/out/clear_blank_lines/X05e.java (-7 / +7 lines)
17	* end-user documentation included with the redistribution, if any, must include	17	* end-user documentation included with the redistribution, if any, must include
18	* the following acknowledgment: "This product includes software developed by	18	* the following acknowledgment: "This product includes software developed by
19	* the Apache Software Foundation (http://www.apache.org/)." Alternately, this	19	* the Apache Software Foundation (http://www.apache.org/)." Alternately, this
20	* acknowledgment may appear in the software itself, if and wherever such third-	20	* acknowledgment may appear in the software itself, if and wherever such
21	* party acknowledgments normally appear. 4. The names "Apache" and	21	* third-party acknowledgments normally appear. 4. The names "Apache" and
22	* "Apache Software Foundation" and "Apache Lucene" must not be used to endorse	22	* "Apache Software Foundation" and "Apache Lucene" must not be used to endorse
23	* or promote products derived from this software without prior written	23	* or promote products derived from this software without prior written
24	* permission. For written permission, please contact apache@apache.org. 5.	24	* permission. For written permission, please contact apache@apache.org. 5.
Lines 34-44 Link Here
34	* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,	34	* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
35	* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR	35	* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
36	* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF	36	* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
37	* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ==================================	37	* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
38	* ================================== This software consists of voluntary	38	* ==================================================================== This
39	* contributions made by many individuals on behalf of the Apache Software	39	* software consists of voluntary contributions made by many individuals on
40	* Foundation. For more information on the Apache Software Foundation, please	40	* behalf of the Apache Software Foundation. For more information on the Apache
41	* see <http://www.apache.org/>.	41	* Software Foundation, please see <http://www.apache.org/>.
42	*/	42	*/
43	class Y05 {	43	class Y05 {
44	}	44	}

Lines 41-58 Link Here

(-)workspace/FormatterJavadoc/test/wksp/eclipse/out/default/X08.java (-12 / +12 lines)
41	* <code>isSaveNeeded</code> . The value <code>true</code> triggers a subsequent	41	* <code>isSaveNeeded</code> . The value <code>true</code> triggers a subsequent
42	* call to <code>save</code> where the modified resources can be saved.	42	* call to <code>save</code> where the modified resources can be saved.
43	* <p>	43	* <p>
44	* The most important part of this implementation is the setup of the compare/	44	* The most important part of this implementation is the setup of the
45	* merge UI. The UI uses a simple browser metaphor to present compare results.	45	* compare/merge UI. The UI uses a simple browser metaphor to present compare
46	* The top half of the layout shows the structural compare results (e.g. added,	46	* results. The top half of the layout shows the structural compare results
47	* deleted, and changed files), the bottom half the content compare results (e.g	47	* (e.g. added, deleted, and changed files), the bottom half the content compare
48	* . textual differences between two files). A selection in the top pane is fed	48	* results (e.g. textual differences between two files). A selection in the top
49	* to the bottom pane. If a content viewer is registered for the type of the	49	* pane is fed to the bottom pane. If a content viewer is registered for the
50	* selected object, this viewer is installed in the pane. In addition if a	50	* type of the selected object, this viewer is installed in the pane. In
51	* structure viewer is registered for the selection type the top pane is split	51	* addition if a structure viewer is registered for the selection type the top
52	* horizontally to make room for another pane and the structure viewer is	52	* pane is split horizontally to make room for another pane and the structure
53	* installed in it. When comparing Java files this second structure viewer would	53	* viewer is installed in it. When comparing Java files this second structure
54	* show the structural differences within a Java file, e.g. added, deleted or	54	* viewer would show the structural differences within a Java file, e.g. added,
55	* changed methods and fields.	55	* deleted or changed methods and fields.
56	* <p>	56	* <p>
57	* Subclasses provide custom setups, e.g. for a Catchup/Release operation by	57	* Subclasses provide custom setups, e.g. for a Catchup/Release operation by
58	* passing a subclass of <code>CompareConfiguration</code> and by implementing	58	* passing a subclass of <code>CompareConfiguration</code> and by implementing

Added Link Here

(-)workspace/FormatterJavadoc/test/tags/param/out/dont_indent_descr/X06.java (+14 lines)
1	package test.tags.param;
2
3	public class X06 {
4	/**
5	* Returns a collection of projects referenced by a build scope attribute.
6	*
7	* @param scope
8	* build scope attribute (<code>ATTR_BUILD_SCOPE</code>)
9	* @return collection of porjects referred to by the scope attribute
10	*/
11	int foo() {
12	return 0;
13	}
14	}

Added Link Here

(-)workspace/FormatterJavadoc/test/wksp/eclipse/out/dont_indent_tags/X14.java (+21 lines)
1	package test.wksp.eclipse;
2
3	public class X14 {
4
5	/**
6	* Returns an open input stream on the contents of the specified help
7	* resource. The client is responsible for closing the stream when finished.
8	*
9	* @param href
10	* the URL (as a string) of the help resource
11	* <p>
12	* Valid href are as described in {@link
13	* org.eclipse.help.IHelpResource#getHref IHelpResource.getHref}
14	* </p>
15	* @return an input stream containing the contents of the help resource, or
16	* <code>null</code> if the help resource could not be found and opened
17	*/
18	int foo(String href) {
19	return 0;
20	}
21	}

Added Link Here

(-)workspace/FormatterJavadoc/test/tags/param/out/dont_indent_tags/X05.java (+12 lines)
1	package test.tags.param;
2
3	public class X05 {
4	/**
5	* Test with exception tag.
6	*
7	* @exception Throwable
8	* if any exception is thrown
9	*/
10	public void foo() throws Throwable {
11	}
12	}