Attachment #160957 for bug #304506

Lines 368-377 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/parser/Scanner.java (-2 / +1 lines)
368	continue;	368	continue;
369	}	369	}
370	// trim the message	370	// trim the message
		371	// we don't trim the beginning of the message to be able to show it after the task tag
371	while (CharOperation.isWhitespace(src[end]) && msgStart <= end)	372	while (CharOperation.isWhitespace(src[end]) && msgStart <= end)
372	end--;	373	end--;
373	while (CharOperation.isWhitespace(src[msgStart]) && msgStart <= end)
374	msgStart++;
375	// update the end position of the task	374	// update the end position of the task
376	this.foundTaskPositions[i][1] = end;	375	this.foundTaskPositions[i][1] = end;
377	// get the message source	376	// get the message source

Lines 374-380 Link Here

(-)compiler/org/eclipse/jdt/internal/compiler/problem/messages.properties (-1 / +1 lines)
374	441 = 'enum' should not be used as an identifier, since it is a reserved keyword from source level 1.5 on	374	441 = 'enum' should not be used as an identifier, since it is a reserved keyword from source level 1.5 on
375	442 = Enum constants cannot be surrounded by parenthesis	375	442 = Enum constants cannot be surrounded by parenthesis
376		376
377	450 = {0} {1}	377	450 = {0}{1}
378		378
379	451 = Null pointer access: The variable {0} can only be null at this location	379	451 = Null pointer access: The variable {0} can only be null at this location
380	452 = Potential null pointer access: The variable {0} may be null at this location	380	452 = Potential null pointer access: The variable {0} may be null at this location




/*******************************************************************************
 * Copyright (c) 2000, 2010 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

			continue;
		}
		// trim the message
		// we don't trim the beginning of the message to be able to show it after the task tag
		while (CharOperation.isWhitespace(src[end]) && msgStart <= end)
			end--;
		while (CharOperation.isWhitespace(src[msgStart]) && msgStart <= end)
			msgStart++;
		// update the end position of the task
		this.foundTaskPositions[i][1] = end;
		// get the message source

								boolean isUnicode = false;
								while (this.currentCharacter != '\r' && this.currentCharacter != '\n') {
									if (this.currentPosition >= this.eofPosition) {
										this.lastCommentLinePosition = this.currentPosition;
										this.currentPosition ++;
										// this avoids duplicating the code in the catch(IndexOutOfBoundsException e)
										throw new IndexOutOfBoundsException();
									}

								boolean isUnicode = false;
								while (this.currentCharacter != '\r' && this.currentCharacter != '\n') {
									if (this.currentPosition >= this.eofPosition) {
										this.lastCommentLinePosition = this.currentPosition;
										this.currentPosition ++;
										// this avoids duplicating the code inside the catch(IndexOutOfBoundsException e) below
										throw new IndexOutOfBoundsException();
									}

	if (this.currentPosition <= 0)
		return "NOT started!\n\n"+ new String(this.source); //$NON-NLS-1$

	StringBuffer buffer = new StringBuffer();
	if (this.startPosition < 1000) {
		buffer.append(this.source, 0, this.startPosition);
	} else {
		buffer.append("<source beginning>\n...\n"); //$NON-NLS-1$
		int line = Util.getLineNumber(this.startPosition-1000, this.lineEnds, 0, this.linePtr);
		int lineStart = getLineStart(line);
		buffer.append(this.source, lineStart, this.startPosition-lineStart);
	}

	buffer.append("\n===============================\nStarts here -->"); //$NON-NLS-1$
	int middleLength = (this.currentPosition - 1) - this.startPosition + 1;
	char middle[];
	if (middleLength > -1) {
		buffer.append(this.source, this.startPosition, middleLength);
		System.arraycopy(
			this.source,
			this.startPosition,
			middle,
			0,
			middleLength);
	} else {
		middle = CharOperation.NO_CHAR;
	}
	buffer.append("<-- Ends here\n===============================\n"); //$NON-NLS-1$

	buffer.append(this.source, (this.currentPosition - 1) + 1, this.eofPosition - (this.currentPosition - 1) - 1);

	return buffer.toString();
		(this.currentPosition - 1) + 1,
		end,
		0,
		this.eofPosition - (this.currentPosition - 1) - 1);

	return new String(front)
		+ "\n===============================\nStarts here -->" //$NON-NLS-1$
		+ new String(middle)
		+ "<-- Ends here\n===============================\n" //$NON-NLS-1$
		+ new String(end);
}
public String toStringAction(int act) {
	switch (act) {

Lines 10879-10920 Link Here

(-)Eclipse Java Tests Compiler/org/eclipse/jdt/tests/compiler/regression/NegativeTest.java (-40 / +40 lines)
10879	"1. WARNING in p\\X.java (at line 3)\n" +	10879	"1. WARNING in p\\X.java (at line 3)\n" +
10880	" * TODO:todo1 \n" +	10880	" * TODO:todo1 \n" +
10881	" ^^^^^^^^^^\n" +	10881	" ^^^^^^^^^^\n" +
10882	"TODO: todo1\n" +	10882	"TODO:todo1\n" +
10883	"----------\n" +	10883	"----------\n" +
10884	"2. WARNING in p\\X.java (at line 7)\n" +	10884	"2. WARNING in p\\X.java (at line 7)\n" +
10885	" * TODO: todo2 \n" +	10885	" * TODO: todo2 \n" +
10886	" ^^^^^^^^^^^^^\n" +	10886	" ^^^^^^^^^^^^^\n" +
10887	"TODO: todo2\n" +	10887	"TODO: todo2\n" +
10888	"----------\n" +	10888	"----------\n" +
10889	"3. WARNING in p\\X.java (at line 12)\n" +	10889	"3. WARNING in p\\X.java (at line 12)\n" +
10890	" * TODO:todo3 \n" +	10890	" * TODO:todo3 \n" +
10891	" ^^^^^^^^^^\n" +	10891	" ^^^^^^^^^^\n" +
10892	"TODO: todo3\n" +	10892	"TODO:todo3\n" +
10893	"----------\n" +	10893	"----------\n" +
10894	"4. WARNING in p\\X.java (at line 14)\n" +	10894	"4. WARNING in p\\X.java (at line 14)\n" +
10895	" // TODO:todo4a \n" +	10895	" // TODO:todo4a \n" +
10896	" ^^^^^^^^^^^\n" +	10896	" ^^^^^^^^^^^\n" +
10897	"TODO: todo4a\n" +	10897	"TODO:todo4a\n" +
10898	"----------\n" +	10898	"----------\n" +
10899	"5. WARNING in p\\X.java (at line 15)\n" +	10899	"5. WARNING in p\\X.java (at line 15)\n" +
10900	" //#todo# todo4b \n" +	10900	" //#todo# todo4b \n" +
10901	" ^^^^^^^^^^^^^^^\n" +	10901	" ^^^^^^^^^^^^^^^\n" +
10902	"#todo# todo4b\n" +	10902	"#todo# todo4b\n" +
10903	"----------\n" +	10903	"----------\n" +
10904	"6. WARNING in p\\X.java (at line 19)\n" +	10904	"6. WARNING in p\\X.java (at line 19)\n" +
10905	" * TODO:todo5 \n" +	10905	" * TODO:todo5 \n" +
10906	" ^^^^^^^^^^\n" +	10906	" ^^^^^^^^^^\n" +
10907	"TODO: todo5\n" +	10907	"TODO:todo5\n" +
10908	"----------\n" +	10908	"----------\n" +
10909	"7. WARNING in p\\X.java (at line 23)\n" +	10909	"7. WARNING in p\\X.java (at line 23)\n" +
10910	" * TODO:todo6a \n" +	10910	" * TODO:todo6a \n" +
10911	" ^^^^^^^^^^^\n" +	10911	" ^^^^^^^^^^^\n" +
10912	"TODO: todo6a\n" +	10912	"TODO:todo6a\n" +
10913	"----------\n" +	10913	"----------\n" +
10914	"8. WARNING in p\\X.java (at line 24)\n" +	10914	"8. WARNING in p\\X.java (at line 24)\n" +
10915	" * TODO:todo6b \n" +	10915	" * TODO:todo6b \n" +
10916	" ^^^^^^^^^^^\n" +	10916	" ^^^^^^^^^^^\n" +
10917	"TODO: todo6b\n" +	10917	"TODO:todo6b\n" +
10918	"----------\n" +	10918	"----------\n" +
10919	"9. WARNING in p\\X.java (at line 26)\n" +	10919	"9. WARNING in p\\X.java (at line 26)\n" +
10920	" System.out.println(\"My char: \" + String.valueOf((char)self.MY_CHAR)); \n" +	10920	" System.out.println(\"My char: \" + String.valueOf((char)self.MY_CHAR)); \n" +
Lines 10924-10940 Link Here
10924	"10. WARNING in p\\X.java (at line 28)\n" +	10924	"10. WARNING in p\\X.java (at line 28)\n" +
10925	" * TODO:todo7 \n" +	10925	" * TODO:todo7 \n" +
10926	" ^^^^^^^^^^\n" +	10926	" ^^^^^^^^^^\n" +
10927	"TODO: todo7\n" +	10927	"TODO:todo7\n" +
10928	"----------\n" +	10928	"----------\n" +
10929	"11. WARNING in p\\X.java (at line 32)\n" +	10929	"11. WARNING in p\\X.java (at line 32)\n" +
10930	" * TODO:todo8 */ \n" +	10930	" * TODO:todo8 */ \n" +
10931	" ^^^^^^^^^^\n" +	10931	" ^^^^^^^^^^\n" +
10932	"TODO: todo8\n" +	10932	"TODO:todo8\n" +
10933	"----------\n" +	10933	"----------\n" +
10934	"12. WARNING in p\\X.java (at line 36)\n" +	10934	"12. WARNING in p\\X.java (at line 36)\n" +
10935	" * TODO:todo9 \n" +	10935	" * TODO:todo9 \n" +
10936	" ^^^^^^^^^^\n" +	10936	" ^^^^^^^^^^\n" +
10937	"TODO: todo9\n" +	10937	"TODO:todo9\n" +
10938	"----------\n",	10938	"----------\n",
10939	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);	10939	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);
10940	}	10940	}
Lines 11935-11941 Link Here
11935	"1. WARNING in p\\X.java (at line 4)\n" +	11935	"1. WARNING in p\\X.java (at line 4)\n" +
11936	" //TODO:hkjhkhkj\n" +	11936	" //TODO:hkjhkhkj\n" +
11937	" ^^^^^^^^^^^^^\n" +	11937	" ^^^^^^^^^^^^^\n" +
11938	"TODO: hkjhkhkj\n" +	11938	"TODO:hkjhkhkj\n" +
11939	"----------\n",	11939	"----------\n",
11940	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);	11940	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);
11941	}	11941	}
Lines 11961-11967 Link Here
11961	"1. WARNING in p\\X.java (at line 5)\n" +	11961	"1. WARNING in p\\X.java (at line 5)\n" +
11962	" //TODO:hkjhkhkj\n" +	11962	" //TODO:hkjhkhkj\n" +
11963	" ^^^^^^^^^^^^^\n" +	11963	" ^^^^^^^^^^^^^\n" +
11964	"TODO: hkjhkhkj\n" +	11964	"TODO:hkjhkhkj\n" +
11965	"----------\n" +	11965	"----------\n" +
11966	"2. ERROR in p\\X.java (at line 8)\n" +	11966	"2. ERROR in p\\X.java (at line 8)\n" +
11967	" }\n" +	11967	" }\n" +
Lines 12191-12242 Link Here
12191	"1. WARNING in p\\X.java (at line 3)\n" +	12191	"1. WARNING in p\\X.java (at line 3)\n" +
12192	" * TODO:commentTODO:comment 2#todo#\n" +	12192	" * TODO:commentTODO:comment 2#todo#\n" +
12193	" ^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +	12193	" ^^^^^^^^^^^^^^^^^^^^^^^^^^\n" +
12194	"TODO: commentTODO:comment 2\n" +	12194	"TODO:commentTODO:comment 2\n" +
12195	"----------\n" +	12195	"----------\n" +
12196	"2. WARNING in p\\X.java (at line 3)\n" +	12196	"2. WARNING in p\\X.java (at line 3)\n" +
12197	" * TODO:commentTODO:comment 2#todo#\n" +	12197	" * TODO:commentTODO:comment 2#todo#\n" +
12198	" ^^^^^^\n" +	12198	" ^^^^^^\n" +
12199	"#todo# \n" +	12199	"#todo#\n" +
12200	"----------\n" +	12200	"----------\n" +
12201	"3. WARNING in p\\X.java (at line 5)\n" +	12201	"3. WARNING in p\\X.java (at line 5)\n" +
12202	" // TODO:comment 3#todo#comment 4TODO:\n" +	12202	" // TODO:comment 3#todo#comment 4TODO:\n" +
12203	" ^^^^^^^^^^^^^^\n" +	12203	" ^^^^^^^^^^^^^^\n" +
12204	"TODO: comment 3\n" +	12204	"TODO:comment 3\n" +
12205	"----------\n" +	12205	"----------\n" +
12206	"4. WARNING in p\\X.java (at line 5)\n" +	12206	"4. WARNING in p\\X.java (at line 5)\n" +
12207	" // TODO:comment 3#todo#comment 4TODO:\n" +	12207	" // TODO:comment 3#todo#comment 4TODO:\n" +
12208	" ^^^^^^^^^^^^^^^^^^^^\n" +	12208	" ^^^^^^^^^^^^^^^^^^^^\n" +
12209	"#todo# comment 4TODO:\n" +	12209	"#todo#comment 4TODO:\n" +
12210	"----------\n" +	12210	"----------\n" +
12211	"5. WARNING in p\\X.java (at line 7)\n" +	12211	"5. WARNING in p\\X.java (at line 7)\n" +
12212	" * TODO:comment 5 TODO:comment 6 #todo# \n" +	12212	" * TODO:comment 5 TODO:comment 6 #todo# \n" +
12213	" ^^^^^^^^^^^^^^\n" +	12213	" ^^^^^^^^^^^^^^\n" +
12214	"TODO: comment 5\n" +	12214	"TODO:comment 5\n" +
12215	"----------\n" +	12215	"----------\n" +
12216	"6. WARNING in p\\X.java (at line 7)\n" +	12216	"6. WARNING in p\\X.java (at line 7)\n" +
12217	" * TODO:comment 5 TODO:comment 6 #todo# \n" +	12217	" * TODO:comment 5 TODO:comment 6 #todo# \n" +
12218	" ^^^^^^^^^^^^^^\n" +	12218	" ^^^^^^^^^^^^^^\n" +
12219	"TODO: comment 6\n" +	12219	"TODO:comment 6\n" +
12220	"----------\n" +	12220	"----------\n" +
12221	"7. WARNING in p\\X.java (at line 7)\n" +	12221	"7. WARNING in p\\X.java (at line 7)\n" +
12222	" * TODO:comment 5 TODO:comment 6 #todo# \n" +	12222	" * TODO:comment 5 TODO:comment 6 #todo# \n" +
12223	" ^^^^^^\n" +	12223	" ^^^^^^\n" +
12224	"#todo# \n" +	12224	"#todo#\n" +
12225	"----------\n" +	12225	"----------\n" +
12226	"8. WARNING in p\\X.java (at line 9)\n" +	12226	"8. WARNING in p\\X.java (at line 9)\n" +
12227	" // #todo#comment 7 TODO:comment 8 TODO: \n" +	12227	" // #todo#comment 7 TODO:comment 8 TODO: \n" +
12228	" ^^^^^^^^^^^^^^^\n" +	12228	" ^^^^^^^^^^^^^^^\n" +
12229	"#todo# comment 7\n" +	12229	"#todo#comment 7\n" +
12230	"----------\n" +	12230	"----------\n" +
12231	"9. WARNING in p\\X.java (at line 9)\n" +	12231	"9. WARNING in p\\X.java (at line 9)\n" +
12232	" // #todo#comment 7 TODO:comment 8 TODO: \n" +	12232	" // #todo#comment 7 TODO:comment 8 TODO: \n" +
12233	" ^^^^^^^^^^^^^^\n" +	12233	" ^^^^^^^^^^^^^^\n" +
12234	"TODO: comment 8\n" +	12234	"TODO:comment 8\n" +
12235	"----------\n" +	12235	"----------\n" +
12236	"10. WARNING in p\\X.java (at line 9)\n" +	12236	"10. WARNING in p\\X.java (at line 9)\n" +
12237	" // #todo#comment 7 TODO:comment 8 TODO: \n" +	12237	" // #todo#comment 7 TODO:comment 8 TODO: \n" +
12238	" ^^^^^\n" +	12238	" ^^^^^\n" +
12239	"TODO: \n" +	12239	"TODO:\n" +
12240	"----------\n",	12240	"----------\n",
12241	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);	12241	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);
12242	}	12242	}
Lines 12678-12684 Link Here
12678	"1. WARNING in p\\X.java (at line 3)\n" +	12678	"1. WARNING in p\\X.java (at line 3)\n" +
12679	" * TODO:todo1 \n" +	12679	" * TODO:todo1 \n" +
12680	" ^^^^^^^^^^\n" +	12680	" ^^^^^^^^^^\n" +
12681	"TODO: todo1\n" +	12681	"TODO:todo1\n" +
12682	"----------\n" +	12682	"----------\n" +
12683	"2. WARNING in p\\X.java (at line 8)\n" +	12683	"2. WARNING in p\\X.java (at line 8)\n" +
12684	" * #todo# second todo TODO: third todo\n" +	12684	" * #todo# second todo TODO: third todo\n" +
Lines 13154-13160 Link Here
13154	"1. WARNING in p\\X.java (at line 4)\n" +	13154	"1. WARNING in p\\X.java (at line 4)\n" +
13155	" }//TODO\n" +	13155	" }//TODO\n" +
13156	" ^^^^\n" +	13156	" ^^^^\n" +
13157	"TODO \n" +	13157	"TODO\n" +
13158	"----------\n",	13158	"----------\n",
13159	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);	13159	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);
13160	}	13160	}
Lines 13586-13592 Link Here
13586	"1. WARNING in p\\X.java (at line 4)\n" +	13586	"1. WARNING in p\\X.java (at line 4)\n" +
13587	" }//TODO\n" +	13587	" }//TODO\n" +
13588	" ^^^^\n" +	13588	" ^^^^\n" +
13589	"TODO \n" +	13589	"TODO\n" +
13590	"----------\n",	13590	"----------\n",
13591	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);	13591	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);
13592	}	13592	}
Lines 13616-13622 Link Here
13616	"1. WARNING in p\\X.java (at line 5)\n" +	13616	"1. WARNING in p\\X.java (at line 5)\n" +
13617	" /TODO/ \n" +	13617	" /TODO/ \n" +
13618	" ^^^^^^\n" +	13618	" ^^^^^^\n" +
13619	"TODO */\n" +	13619	"TODO*/\n" +
13620	"----------\n" +	13620	"----------\n" +
13621	"2. WARNING in p\\X.java (at line 7)\n" +	13621	"2. WARNING in p\\X.java (at line 7)\n" +
13622	" //TODO REMPLACER aa \n" +	13622	" //TODO REMPLACER aa \n" +
Lines 13626-13632 Link Here
13626	"3. WARNING in p\\X.java (at line 9)\n" +	13626	"3. WARNING in p\\X.java (at line 9)\n" +
13627	" }//TODO \n" +	13627	" }//TODO \n" +
13628	" ^^^^\n" +	13628	" ^^^^\n" +
13629	"TODO \n" +	13629	"TODO\n" +
13630	"----------\n",	13630	"----------\n",
13631	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);	13631	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);
13632	}	13632	}
Lines 13658-13679 Link Here
13658	"1. WARNING in p\\X.java (at line 5)\n" +	13658	"1. WARNING in p\\X.java (at line 5)\n" +
13659	" /TODO/ \n" +	13659	" /TODO/ \n" +
13660	" ^^^^^^\n" +	13660	" ^^^^^^\n" +
13661	"TODO */\n" +	13661	"TODO*/\n" +
13662	"----------\n" +	13662	"----------\n" +
13663	"2. WARNING in p\\X.java (at line 7)\n" +	13663	"2. WARNING in p\\X.java (at line 7)\n" +
13664	" //TODO REM:PLACER aa \n" +	13664	" //TODO REM:PLACER aa \n" +
13665	" ^^^^^^^^^^^^^^^^^^\n" +	13665	" ^^^^^^^^^^^^^^^^^^\n" +
13666	"TODO PLACER aa\n" +	13666	"TODOPLACER aa\n" +
13667	"----------\n" +	13667	"----------\n" +
13668	"3. WARNING in p\\X.java (at line 7)\n" +	13668	"3. WARNING in p\\X.java (at line 7)\n" +
13669	" //TODO REM:PLACER aa \n" +	13669	" //TODO REM:PLACER aa \n" +
13670	" ^^^^^^^^^^^^^\n" +	13670	" ^^^^^^^^^^^^^\n" +
13671	"REM: PLACER aa\n" +	13671	"REM:PLACER aa\n" +
13672	"----------\n" +	13672	"----------\n" +
13673	"4. WARNING in p\\X.java (at line 9)\n" +	13673	"4. WARNING in p\\X.java (at line 9)\n" +
13674	" }//TODO \n" +	13674	" }//TODO \n" +
13675	" ^^^^\n" +	13675	" ^^^^\n" +
13676	"TODO \n" +	13676	"TODO\n" +
13677	"----------\n",	13677	"----------\n",
13678	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);	13678	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);
13679	}	13679	}
Lines 13704-13725 Link Here
13704	"1. WARNING in p\\X.java (at line 5)\n" +	13704	"1. WARNING in p\\X.java (at line 5)\n" +
13705	" /TODO:/ \n" +	13705	" /TODO:/ \n" +
13706	" ^^^^^^^\n" +	13706	" ^^^^^^^\n" +
13707	"TODO: */\n" +	13707	"TODO:*/\n" +
13708	"----------\n" +	13708	"----------\n" +
13709	"2. WARNING in p\\X.java (at line 7)\n" +	13709	"2. WARNING in p\\X.java (at line 7)\n" +
13710	" //TODO:REM:PLACER aa \n" +	13710	" //TODO:REM:PLACER aa \n" +
13711	" ^^^^^^^^^^^^^^^^^^\n" +	13711	" ^^^^^^^^^^^^^^^^^^\n" +
13712	"TODO: PLACER aa\n" +	13712	"TODO:PLACER aa\n" +
13713	"----------\n" +	13713	"----------\n" +
13714	"3. WARNING in p\\X.java (at line 7)\n" +	13714	"3. WARNING in p\\X.java (at line 7)\n" +
13715	" //TODO:REM:PLACER aa \n" +	13715	" //TODO:REM:PLACER aa \n" +
13716	" ^^^^^^^^^^^^^\n" +	13716	" ^^^^^^^^^^^^^\n" +
13717	"REM: PLACER aa\n" +	13717	"REM:PLACER aa\n" +
13718	"----------\n" +	13718	"----------\n" +
13719	"4. WARNING in p\\X.java (at line 9)\n" +	13719	"4. WARNING in p\\X.java (at line 9)\n" +
13720	" }//TODO: \n" +	13720	" }//TODO: \n" +
13721	" ^^^^^\n" +	13721	" ^^^^^\n" +
13722	"TODO: \n" +	13722	"TODO:\n" +
13723	"----------\n",	13723	"----------\n",
13724	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);	13724	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);
13725	}	13725	}
Lines 13749-13760 Link Here
13749	"1. WARNING in p\\X.java (at line 6)\n" +	13749	"1. WARNING in p\\X.java (at line 6)\n" +
13750	" //consider#TODO#\n" +	13750	" //consider#TODO#\n" +
13751	" ^^^^^^\n" +	13751	" ^^^^^^\n" +
13752	"#TODO# \n" +	13752	"#TODO#\n" +
13753	"----------\n" +	13753	"----------\n" +
13754	"2. WARNING in p\\X.java (at line 8)\n" +	13754	"2. WARNING in p\\X.java (at line 8)\n" +
13755	" }//#TODO#\n" +	13755	" }//#TODO#\n" +
13756	" ^^^^^^\n" +	13756	" ^^^^^^\n" +
13757	"#TODO# \n" +	13757	"#TODO#\n" +
13758	"----------\n",	13758	"----------\n",
13759	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);	13759	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);
13760	}	13760	}
Lines 15410-15416 Link Here
15410	"1. WARNING in p\\X.java (at line 8)\n" +	15410	"1. WARNING in p\\X.java (at line 8)\n" +
15411	" }//#TODO#\n" +	15411	" }//#TODO#\n" +
15412	" ^^^^^\n" +	15412	" ^^^^^\n" +
15413	"TODO #\n" +	15413	"TODO#\n" +
15414	"----------\n",	15414	"----------\n",
15415	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);	15415	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);
15416	}	15416	}
Lines 15470-15476 Link Here
15470	"1. WARNING in p\\X.java (at line 8)\n" +	15470	"1. WARNING in p\\X.java (at line 8)\n" +
15471	" }//#todO#\n" +	15471	" }//#todO#\n" +
15472	" ^^^^^\n" +	15472	" ^^^^^\n" +
15473	"TODO #\n" +	15473	"TODO#\n" +
15474	"----------\n",	15474	"----------\n",
15475	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);	15475	null, null, JavacTestOptions.Excuse.EclipseHasSomeMoreWarnings);
15476	}	15476	}

Lines 1-5 Link Here

(-)src/org/eclipse/jdt/core/tests/builder/ErrorsTests.java (-2 / +2 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2008 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 208-214 Link Here
208	);	208	);
209	fullBuild();	209	fullBuild();
210	Problem[] prob1 = env.getProblemsFor(classTest1);	210	Problem[] prob1 = env.getProblemsFor(classTest1);
211	expectingSpecificProblemFor(classTest1, new Problem("p1", "TODO : marker only", classTest1, 38, 55, -1, IMarker.SEVERITY_ERROR));	211	expectingSpecificProblemFor(classTest1, new Problem("p1", "TODO: marker only", classTest1, 38, 55, -1, IMarker.SEVERITY_ERROR));
212	assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());	212	assertEquals(JavaBuilder.SOURCE_ID, prob1[0].getSourceId());
213	}	213	}
214		214




			"  }\n" +
			"}\n"},
		null,
		"[FIXME, message contents,HIGH]\n" +
		"[TODO, message contents,NORMAL]\n" +
		"[XXX, message contents,NORMAL]\n");
}
// effect of cancelling priorities
// reactivate when bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=143402 is fixed

			"  }\n" +
			"}\n"},
		customOptions,
		"[FIXME, message contents,NORMAL]\n" +
		"[TODO, message contents,NORMAL]\n" +
		"[XXX, message contents,NORMAL]\n");
}
// effect of cancelling priorities
// reactivate when bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=143402 is fixed

			"  }\n" +
			"}\n"},
		customOptions,
		"[FIXME, message contents,NORMAL]\n" +
		"[TODO, message contents,NORMAL]\n" +
		"[XXX, message contents,NORMAL]\n");
}
// effect of changing priorities
// reactivate when bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=143402 is fixed

Return to bug 304506

Lines 1-5 Link Here

(-)model/org/eclipse/jdt/internal/core/util/PublicScanner.java (-30 / +21 lines)
1	/*******************************************************************************	1	/*******************************************************************************
2	* Copyright (c) 2000, 2009 IBM Corporation and others.	2	* Copyright (c) 2000, 2010 IBM Corporation and others.
3	* All rights reserved. This program and the accompanying materials	3	* All rights reserved. This program and the accompanying materials
4	* are made available under the terms of the Eclipse Public License v1.0	4	* are made available under the terms of the Eclipse Public License v1.0
5	* which accompanies this distribution, and is available at	5	* which accompanies this distribution, and is available at
Lines 365-374 Link Here
365	continue;	365	continue;
366	}	366	}
367	// trim the message	367	// trim the message
		368	// we don't trim the beginning of the message to be able to show it after the task tag
368	while (CharOperation.isWhitespace(src[end]) && msgStart <= end)	369	while (CharOperation.isWhitespace(src[end]) && msgStart <= end)
369	end--;	370	end--;
370	while (CharOperation.isWhitespace(src[msgStart]) && msgStart <= end)
371	msgStart++;
372	// update the end position of the task	371	// update the end position of the task
373	this.foundTaskPositions[i][1] = end;	372	this.foundTaskPositions[i][1] = end;
374	// get the message source	373	// get the message source
Lines 1487-1493 Link Here
1487	boolean isUnicode = false;	1486	boolean isUnicode = false;
1488	while (this.currentCharacter != '\r' && this.currentCharacter != '\n') {	1487	while (this.currentCharacter != '\r' && this.currentCharacter != '\n') {
1489	if (this.currentPosition >= this.eofPosition) {	1488	if (this.currentPosition >= this.eofPosition) {
1490	this.currentPosition++;	1489	this.lastCommentLinePosition = this.currentPosition;
		1490	this.currentPosition ++;
1491	// this avoids duplicating the code in the catch(IndexOutOfBoundsException e)	1491	// this avoids duplicating the code in the catch(IndexOutOfBoundsException e)
1492	throw new IndexOutOfBoundsException();	1492	throw new IndexOutOfBoundsException();
1493	}	1493	}
Lines 1947-1953 Link Here
1947	boolean isUnicode = false;	1947	boolean isUnicode = false;
1948	while (this.currentCharacter != '\r' && this.currentCharacter != '\n') {	1948	while (this.currentCharacter != '\r' && this.currentCharacter != '\n') {
1949	if (this.currentPosition >= this.eofPosition) {	1949	if (this.currentPosition >= this.eofPosition) {
1950	this.currentPosition++;	1950	this.lastCommentLinePosition = this.currentPosition;
		1951	this.currentPosition ++;
1951	// this avoids duplicating the code inside the catch(IndexOutOfBoundsException e) below	1952	// this avoids duplicating the code inside the catch(IndexOutOfBoundsException e) below
1952	throw new IndexOutOfBoundsException();	1953	throw new IndexOutOfBoundsException();
1953	}	1954	}
Lines 3659-3694 Link Here
3659	if (this.currentPosition <= 0)	3660	if (this.currentPosition <= 0)
3660	return "NOT started!\n\n"+ new String(this.source); //$NON-NLS-1$	3661	return "NOT started!\n\n"+ new String(this.source); //$NON-NLS-1$
3661		3662
3662	char front[] = new char[this.startPosition];	3663	StringBuffer buffer = new StringBuffer();
3663	System.arraycopy(this.source, 0, front, 0, this.startPosition);	3664	if (this.startPosition < 1000) {
		3665	buffer.append(this.source, 0, this.startPosition);
		3666	} else {
		3667	buffer.append("<source beginning>\n...\n"); //$NON-NLS-1$
		3668	int line = Util.getLineNumber(this.startPosition-1000, this.lineEnds, 0, this.linePtr);
		3669	int lineStart = getLineStart(line);
		3670	buffer.append(this.source, lineStart, this.startPosition-lineStart);
		3671	}
3664		3672
		3673	buffer.append("\n===============================\nStarts here -->"); //$NON-NLS-1$
3665	int middleLength = (this.currentPosition - 1) - this.startPosition + 1;	3674	int middleLength = (this.currentPosition - 1) - this.startPosition + 1;
3666	char middle[];
3667	if (middleLength > -1) {	3675	if (middleLength > -1) {
3668	middle = new char[middleLength];	3676	buffer.append(this.source, this.startPosition, middleLength);
3669	System.arraycopy(
3670	this.source,
3671	this.startPosition,
3672	middle,
3673	0,
3674	middleLength);
3675	} else {
3676	middle = CharOperation.NO_CHAR;
3677	}	3677	}
		3678	buffer.append("<-- Ends here\n===============================\n"); //$NON-NLS-1$
3678		3679
3679	char end[] = new char[this.eofPosition - (this.currentPosition - 1)];	3680	buffer.append(this.source, (this.currentPosition - 1) + 1, this.eofPosition - (this.currentPosition - 1) - 1);
3680	System.arraycopy(	3681
3681	this.source,	3682	return buffer.toString();
3682	(this.currentPosition - 1) + 1,
3683	end,
3684	0,
3685	this.eofPosition - (this.currentPosition - 1) - 1);
3686
3687	return new String(front)
3688	+ "\n===============================\nStarts here -->" //$NON-NLS-1$
3689	+ new String(middle)
3690	+ "<-- Ends here\n===============================\n" //$NON-NLS-1$
3691	+ new String(end);
3692	}	3683	}
3693	public String toStringAction(int act) {	3684	public String toStringAction(int act) {
3694	switch (act) {	3685	switch (act) {

Lines 188-196 Link Here

(-)src/org/eclipse/jdt/core/tests/compiler/regression/CompilerInvocationTests.java (-9 / +9 lines)
188	" }\n" +	188	" }\n" +
189	"}\n"},	189	"}\n"},
190	null,	190	null,
191	"[FIXME,message contents,HIGH]\n" +	191	"[FIXME, message contents,HIGH]\n" +
192	"[TODO,message contents,NORMAL]\n" +	192	"[TODO, message contents,NORMAL]\n" +
193	"[XXX,message contents,NORMAL]\n");	193	"[XXX, message contents,NORMAL]\n");
194	}	194	}
195	// effect of cancelling priorities	195	// effect of cancelling priorities
196	// reactivate when bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=143402 is fixed	196	// reactivate when bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=143402 is fixed
Lines 206-214 Link Here
206	" }\n" +	206	" }\n" +
207	"}\n"},	207	"}\n"},
208	customOptions,	208	customOptions,
209	"[FIXME,message contents,NORMAL]\n" +	209	"[FIXME, message contents,NORMAL]\n" +
210	"[TODO,message contents,NORMAL]\n" +	210	"[TODO, message contents,NORMAL]\n" +
211	"[XXX,message contents,NORMAL]\n");	211	"[XXX, message contents,NORMAL]\n");
212	}	212	}
213	// effect of cancelling priorities	213	// effect of cancelling priorities
214	// reactivate when bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=143402 is fixed	214	// reactivate when bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=143402 is fixed
Lines 261-269 Link Here
261	" }\n" +	261	" }\n" +
262	"}\n"},	262	"}\n"},
263	customOptions,	263	customOptions,
264	"[FIXME,message contents,NORMAL]\n" +	264	"[FIXME, message contents,NORMAL]\n" +
265	"[TODO,message contents,NORMAL]\n" +	265	"[TODO, message contents,NORMAL]\n" +
266	"[XXX,message contents,NORMAL]\n");	266	"[XXX, message contents,NORMAL]\n");
267	}	267	}
268	// effect of changing priorities	268	// effect of changing priorities
269	// reactivate when bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=143402 is fixed	269	// reactivate when bug https://bugs.eclipse.org/bugs/show_bug.cgi?id=143402 is fixed