MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

IDEA-140025 Ignore incorrect inline tags in doc comments, include all characters till whitespace in tag name, like javadoc tool does,

Browse Source
This commit is contained in:
Dmitry Batrak
2015-05-18 11:36:18 +03:00
parent 5bd7697d8f
commit 4fb41addc4
6 changed files with 219 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/java-psi-impl/gen/com/intellij/lang/java/lexer/_JavaDocLexer.java
+207 -202
View File
@@ -1,20 +1,4 @@
/*
* Copyright 2000-2015 JetBrains s.r.o.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
/* The following code was generated by JFlex 1.4.3 on 1/21/15 7:24 PM */
/* The following code was generated by JFlex 1.4.3 on 5/15/15 11:22 AM */
/* It's an automatically generated code. Do not modify it. */
package com.intellij.lang.java.lexer;
@@ -28,8 +12,8 @@ import com.intellij.psi.tree.IElementType;
/**
* This class is a scanner generated by
* <a href="http://www.jflex.de/">JFlex</a> 1.4.3
* on 1/21/15 7:24 PM from the specification file
* <tt>/Users/yole/jetbrains/IDEA/tools/lexer/../../community/java/java-psi-impl/src/com/intellij/lang/java/lexer/_JavaDocLexer.flex</tt>
* on 5/15/15 11:22 AM from the specification file
* <tt>C:/ws/IDEA/tools/lexer/../../community/java/java-psi-impl/src/com/intellij/lang/java/lexer/_JavaDocLexer.flex</tt>
*/
class _JavaDocLexer implements FlexLexer {
/** initial size of the lookahead buffer */
@@ -63,70 +47,90 @@ class _JavaDocLexer implements FlexLexer {
* Translates characters to character classes
*/
private static final String ZZ_CMAP_PACKED =
"\11\0\1\2\1\35\1\0\1\2\1\1\22\0\1\2\2\0\1\13"+
"\1\4\3\0\1\11\1\12\1\7\1\0\1\14\1\5\1\3\1\6"+
"\12\3\1\5\1\0\1\22\1\0\1\23\1\0\1\15\32\4\1\10"+
"\1\0\1\10\1\0\1\4\1\0\1\17\1\4\1\25\1\27\1\30"+
"\3\4\1\32\2\4\1\31\1\21\1\4\1\26\1\16\1\4\1\20"+
"\1\4\1\33\6\4\1\24\1\0\1\34\44\0\4\4\4\0\1\4"+
"\12\0\1\4\4\0\1\4\5\0\27\4\1\0\37\4\1\0\u013f\4"+
"\31\0\162\4\4\0\14\4\16\0\5\4\11\0\1\4\213\0\1\4"+
"\13\0\1\4\1\0\3\4\1\0\1\4\1\0\24\4\1\0\54\4"+
"\1\0\46\4\1\0\5\4\4\0\202\4\10\0\105\4\1\0\46\4"+
"\2\0\2\4\6\0\20\4\41\0\46\4\2\0\1\4\7\0\47\4"+
"\110\0\33\4\5\0\3\4\56\0\32\4\5\0\13\4\43\0\2\4"+
"\1\0\143\4\1\0\1\4\17\0\2\4\7\0\2\4\12\0\3\4"+
"\2\0\1\4\20\0\1\4\1\0\36\4\35\0\3\4\60\0\46\4"+
"\13\0\1\4\u0152\0\66\4\3\0\1\4\22\0\1\4\7\0\12\4"+
"\43\0\10\4\2\0\2\4\2\0\26\4\1\0\7\4\1\0\1\4"+
"\3\0\4\4\3\0\1\4\36\0\2\4\1\0\3\4\16\0\4\4"+
"\21\0\6\4\4\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4"+
"\1\0\2\4\1\0\2\4\37\0\4\4\1\0\1\4\23\0\3\4"+
"\20\0\11\4\1\0\3\4\1\0\26\4\1\0\7\4\1\0\2\4"+
"\1\0\5\4\3\0\1\4\22\0\1\4\17\0\2\4\17\0\1\4"+
"\23\0\10\4\2\0\2\4\2\0\26\4\1\0\7\4\1\0\2\4"+
"\1\0\5\4\3\0\1\4\36\0\2\4\1\0\3\4\17\0\1\4"+
"\21\0\1\4\1\0\6\4\3\0\3\4\1\0\4\4\3\0\2\4"+
"\1\0\1\4\1\0\2\4\3\0\2\4\3\0\3\4\3\0\10\4"+
"\1\0\3\4\77\0\1\4\13\0\10\4\1\0\3\4\1\0\27\4"+
"\1\0\12\4\1\0\5\4\46\0\2\4\43\0\10\4\1\0\3\4"+
"\1\0\27\4\1\0\12\4\1\0\5\4\3\0\1\4\40\0\1\4"+
"\1\0\2\4\43\0\10\4\1\0\3\4\1\0\27\4\1\0\20\4"+
"\46\0\2\4\43\0\22\4\3\0\30\4\1\0\11\4\1\0\1\4"+
"\2\0\7\4\72\0\60\4\1\0\2\4\13\0\10\4\72\0\2\4"+
"\1\0\1\4\2\0\2\4\1\0\1\4\2\0\1\4\6\0\4\4"+
"\1\0\7\4\1\0\3\4\1\0\1\4\1\0\1\4\2\0\2\4"+
"\1\0\4\4\1\0\2\4\11\0\1\4\2\0\5\4\1\0\1\4"+
"\25\0\2\4\42\0\1\4\77\0\10\4\1\0\42\4\35\0\4\4"+
"\164\0\42\4\1\0\5\4\1\0\2\4\45\0\6\4\112\0\46\4"+
"\12\0\51\4\7\0\132\4\5\0\104\4\5\0\122\4\6\0\7\4"+
"\1\0\77\4\1\0\1\4\1\0\4\4\2\0\7\4\1\0\1\4"+
"\1\0\4\4\2\0\47\4\1\0\1\4\1\0\4\4\2\0\37\4"+
"\1\0\1\4\1\0\4\4\2\0\7\4\1\0\1\4\1\0\4\4"+
"\2\0\7\4\1\0\7\4\1\0\27\4\1\0\37\4\1\0\1\4"+
"\1\0\4\4\2\0\7\4\1\0\47\4\1\0\23\4\105\0\125\4"+
"\14\0\u026c\4\2\0\10\4\12\0\32\4\5\0\113\4\3\0\3\4"+
"\17\0\15\4\1\0\4\4\16\0\22\4\16\0\22\4\16\0\15\4"+
"\1\0\3\4\17\0\64\4\43\0\1\4\3\0\2\4\103\0\130\4"+
"\10\0\51\4\127\0\35\4\63\0\36\4\2\0\5\4\u038b\0\154\4"+
"\224\0\234\4\4\0\132\4\6\0\26\4\2\0\6\4\2\0\46\4"+
"\2\0\6\4\2\0\10\4\1\0\1\4\1\0\1\4\1\0\1\4"+
"\1\0\37\4\2\0\65\4\1\0\7\4\1\0\1\4\3\0\3\4"+
"\1\0\7\4\3\0\4\4\2\0\6\4\4\0\15\4\5\0\3\4"+
"\1\0\7\4\102\0\2\4\23\0\1\4\34\0\1\4\15\0\1\4"+
"\40\0\22\4\120\0\1\4\4\0\1\4\2\0\12\4\1\0\1\4"+
"\3\0\5\4\6\0\1\4\1\0\1\4\1\0\1\4\1\0\4\4"+
"\1\0\3\4\1\0\7\4\3\0\3\4\5\0\5\4\26\0\44\4"+
"\u0e81\0\3\4\31\0\11\4\7\0\5\4\2\0\5\4\4\0\126\4"+
"\6\0\3\4\1\0\137\4\5\0\50\4\4\0\136\4\21\0\30\4"+
"\70\0\20\4\u0200\0\u19b6\4\112\0\u51a6\4\132\0\u048d\4\u0773\0\u2ba4\4"+
"\u215c\0\u012e\4\2\0\73\4\225\0\7\4\14\0\5\4\5\0\1\4"+
"\1\0\12\4\1\0\15\4\1\0\5\4\1\0\1\4\1\0\2\4"+
"\1\0\2\4\1\0\154\4\41\0\u016b\4\22\0\100\4\2\0\66\4"+
"\50\0\15\4\66\0\2\4\30\0\3\4\31\0\1\4\6\0\5\4"+
"\1\0\207\4\7\0\1\4\34\0\32\4\4\0\1\4\1\0\32\4"+
"\12\0\132\4\3\0\6\4\2\0\6\4\2\0\6\4\2\0\3\4"+
"\3\0\2\4\3\0\2\4\31\0";
"\11\0\1\2\1\35\1\0\1\2\1\1\22\0\1\2\2\0\1\14"+
"\1\4\3\0\1\12\1\13\1\10\1\0\1\15\1\5\1\3\1\7"+
"\12\3\1\5\1\0\1\23\1\0\1\24\1\0\1\16\32\4\1\11"+
"\1\0\1\11\1\0\1\4\1\0\1\20\1\4\1\26\1\30\1\31"+
"\3\4\1\33\2\4\1\32\1\22\1\4\1\27\1\17\1\4\1\21"+
"\1\4\1\34\6\4\1\25\1\0\1\6\44\0\4\4\4\0\1\4"+
"\12\0\1\4\4\0\1\4\5\0\27\4\1\0\37\4\1\0\u01ca\4"+
"\4\0\14\4\16\0\5\4\7\0\1\4\1\0\1\4\201\0\5\4"+
"\1\0\2\4\2\0\4\4\10\0\1\4\1\0\3\4\1\0\1\4"+
"\1\0\24\4\1\0\123\4\1\0\213\4\10\0\236\4\11\0\46\4"+
"\2\0\1\4\7\0\47\4\7\0\1\4\100\0\33\4\5\0\3\4"+
"\30\0\1\4\24\0\53\4\43\0\2\4\1\0\143\4\1\0\1\4"+
"\17\0\2\4\7\0\2\4\12\0\3\4\2\0\1\4\20\0\1\4"+
"\1\0\36\4\35\0\131\4\13\0\1\4\30\0\41\4\11\0\2\4"+
"\4\0\1\4\5\0\26\4\4\0\1\4\11\0\1\4\3\0\1\4"+
"\27\0\31\4\107\0\1\4\1\0\13\4\127\0\66\4\3\0\1\4"+
"\22\0\1\4\7\0\12\4\17\0\7\4\1\0\7\4\5\0\10\4"+
"\2\0\2\4\2\0\26\4\1\0\7\4\1\0\1\4\3\0\4\4"+
"\3\0\1\4\20\0\1\4\15\0\2\4\1\0\3\4\16\0\4\4"+
"\7\0\1\4\11\0\6\4\4\0\2\4\2\0\26\4\1\0\7\4"+
"\1\0\2\4\1\0\2\4\1\0\2\4\37\0\4\4\1\0\1\4"+
"\23\0\3\4\20\0\11\4\1\0\3\4\1\0\26\4\1\0\7\4"+
"\1\0\2\4\1\0\5\4\3\0\1\4\22\0\1\4\17\0\2\4"+
"\17\0\1\4\23\0\10\4\2\0\2\4\2\0\26\4\1\0\7\4"+
"\1\0\2\4\1\0\5\4\3\0\1\4\36\0\2\4\1\0\3\4"+
"\17\0\1\4\21\0\1\4\1\0\6\4\3\0\3\4\1\0\4\4"+
"\3\0\2\4\1\0\1\4\1\0\2\4\3\0\2\4\3\0\3\4"+
"\3\0\14\4\26\0\1\4\50\0\1\4\13\0\10\4\1\0\3\4"+
"\1\0\27\4\1\0\12\4\1\0\5\4\3\0\1\4\32\0\2\4"+
"\6\0\2\4\43\0\10\4\1\0\3\4\1\0\27\4\1\0\12\4"+
"\1\0\5\4\3\0\1\4\40\0\1\4\1\0\2\4\17\0\2\4"+
"\22\0\10\4\1\0\3\4\1\0\51\4\2\0\1\4\20\0\1\4"+
"\21\0\2\4\30\0\6\4\5\0\22\4\3\0\30\4\1\0\11\4"+
"\1\0\1\4\2\0\7\4\72\0\60\4\1\0\2\4\13\0\10\4"+
"\72\0\2\4\1\0\1\4\2\0\2\4\1\0\1\4\2\0\1\4"+
"\6\0\4\4\1\0\7\4\1\0\3\4\1\0\1\4\1\0\1\4"+
"\2\0\2\4\1\0\4\4\1\0\2\4\11\0\1\4\2\0\5\4"+
"\1\0\1\4\25\0\4\4\40\0\1\4\77\0\10\4\1\0\44\4"+
"\33\0\5\4\163\0\53\4\24\0\1\4\20\0\6\4\4\0\4\4"+
"\3\0\1\4\3\0\2\4\7\0\3\4\4\0\15\4\14\0\1\4"+
"\21\0\46\4\1\0\1\4\5\0\1\4\2\0\53\4\1\0\u014d\4"+
"\1\0\4\4\2\0\7\4\1\0\1\4\1\0\4\4\2\0\51\4"+
"\1\0\4\4\2\0\41\4\1\0\4\4\2\0\7\4\1\0\1\4"+
"\1\0\4\4\2\0\17\4\1\0\71\4\1\0\4\4\2\0\103\4"+
"\45\0\20\4\20\0\125\4\14\0\u026c\4\2\0\21\4\1\0\32\4"+
"\5\0\113\4\3\0\3\4\17\0\15\4\1\0\4\4\16\0\22\4"+
"\16\0\22\4\16\0\15\4\1\0\3\4\17\0\64\4\43\0\1\4"+
"\3\0\2\4\103\0\130\4\10\0\51\4\1\0\1\4\5\0\106\4"+
"\12\0\35\4\63\0\36\4\2\0\5\4\13\0\54\4\25\0\7\4"+
"\70\0\27\4\11\0\65\4\122\0\1\4\135\0\57\4\21\0\7\4"+
"\67\0\36\4\15\0\2\4\12\0\54\4\32\0\44\4\51\0\3\4"+
"\12\0\44\4\153\0\4\4\1\0\4\4\3\0\2\4\11\0\300\4"+
"\100\0\u0116\4\2\0\6\4\2\0\46\4\2\0\6\4\2\0\10\4"+
"\1\0\1\4\1\0\1\4\1\0\1\4\1\0\37\4\2\0\65\4"+
"\1\0\7\4\1\0\1\4\3\0\3\4\1\0\7\4\3\0\4\4"+
"\2\0\6\4\4\0\15\4\5\0\3\4\1\0\7\4\102\0\2\4"+
"\23\0\1\4\34\0\1\4\15\0\1\4\20\0\15\4\3\0\33\4"+
"\107\0\1\4\4\0\1\4\2\0\12\4\1\0\1\4\3\0\5\4"+
"\6\0\1\4\1\0\1\4\1\0\1\4\1\0\4\4\1\0\13\4"+
"\2\0\4\4\5\0\5\4\4\0\1\4\21\0\51\4\u0a77\0\57\4"+
"\1\0\57\4\1\0\205\4\6\0\4\4\3\0\2\4\14\0\46\4"+
"\1\0\1\4\5\0\1\4\2\0\70\4\7\0\1\4\20\0\27\4"+
"\11\0\7\4\1\0\7\4\1\0\7\4\1\0\7\4\1\0\7\4"+
"\1\0\7\4\1\0\7\4\1\0\7\4\120\0\1\4\u01d5\0\3\4"+
"\31\0\11\4\7\0\5\4\2\0\5\4\4\0\126\4\6\0\3\4"+
"\1\0\132\4\1\0\4\4\5\0\51\4\3\0\136\4\21\0\33\4"+
"\65\0\20\4\u0200\0\u19b6\4\112\0\u51cd\4\63\0\u048d\4\103\0\56\4"+
"\2\0\u010d\4\3\0\20\4\12\0\2\4\24\0\57\4\20\0\31\4"+
"\10\0\120\4\47\0\11\4\2\0\147\4\2\0\4\4\1\0\4\4"+
"\14\0\13\4\115\0\12\4\1\0\3\4\1\0\4\4\1\0\27\4"+
"\25\0\1\4\7\0\64\4\16\0\62\4\76\0\6\4\3\0\1\4"+
"\16\0\34\4\12\0\27\4\31\0\35\4\7\0\57\4\34\0\1\4"+
"\60\0\51\4\27\0\3\4\1\0\10\4\24\0\27\4\3\0\1\4"+
"\5\0\60\4\1\0\1\4\3\0\2\4\2\0\5\4\2\0\1\4"+
"\1\0\1\4\30\0\3\4\2\0\13\4\7\0\3\4\14\0\6\4"+
"\2\0\6\4\2\0\6\4\11\0\7\4\1\0\7\4\221\0\43\4"+
"\35\0\u2ba4\4\14\0\27\4\4\0\61\4\u2104\0\u016e\4\2\0\152\4"+
"\46\0\7\4\14\0\5\4\5\0\1\4\1\0\12\4\1\0\15\4"+
"\1\0\5\4\1\0\1\4\1\0\2\4\1\0\2\4\1\0\154\4"+
"\41\0\u016b\4\22\0\100\4\2\0\66\4\50\0\15\4\66\0\2\4"+
"\30\0\3\4\31\0\1\4\6\0\5\4\1\0\207\4\7\0\1\4"+
"\34\0\32\4\4\0\1\4\1\0\32\4\13\0\131\4\3\0\6\4"+
"\2\0\6\4\2\0\6\4\2\0\3\4\3\0\2\4\3\0\2\4"+
"\31\0";
/**
* Translates characters to character classes
@@ -139,13 +143,13 @@ class _JavaDocLexer implements FlexLexer {
private static final int [] ZZ_ACTION = zzUnpackAction();
private static final String ZZ_ACTION_PACKED_0 =
"\13\0\3\1\1\2\1\3\2\2\1\4\1\5\1\6"+
"\13\0\3\1\1\2\1\3\1\4\2\2\1\5\1\6"+
"\1\7\1\10\1\11\1\12\1\13\1\14\1\15\1\16"+
"\1\17\1\12\1\20\1\1\3\21\1\22\1\0\1\23"+
"\1\0\4\24\1\25\7\24\1\26\1\24\1\27\2\24";
"\1\0\6\24\1\25\12\24\1\26\1\24\2\27\2\24";
private static int [] zzUnpackAction() {
int [] result = new int[57];
int [] result = new int[63];
int offset = 0;
offset = zzUnpackAction(ZZ_ACTION_PACKED_0, offset, result);
return result;
@@ -172,15 +176,15 @@ class _JavaDocLexer implements FlexLexer {
private static final String ZZ_ROWMAP_PACKED_0 =
"\0\0\0\36\0\74\0\132\0\170\0\226\0\264\0\322"+
"\0\360\0\u010e\0\u012c\0\u014a\0\u0168\0\u0186\0\u014a\0\u01a4"+
"\0\u0186\0\u01c2\0\u014a\0\u014a\0\u01e0\0\u01fe\0\u021c\0\u023a"+
"\0\u014a\0\u0186\0\u01c2\0\u014a\0\u01e0\0\u01fe\0\u021c\0\u023a"+
"\0\u0258\0\u014a\0\u014a\0\u014a\0\u014a\0\u014a\0\u0276\0\u014a"+
"\0\u0294\0\u014a\0\u02b2\0\u0186\0\u02b2\0\u02d0\0\u014a\0\u0186"+
"\0\u02ee\0\u030c\0\u032a\0\u0348\0\u014a\0\u0366\0\u0384\0\u03a2"+
"\0\u03c0\0\u03de\0\u03fc\0\u041a\0\u02ee\0\u0438\0\u02ee\0\u0456"+
"\0\u0474";
"\0\u02ee\0\u030c\0\u032a\0\u0348\0\u0366\0\u0384\0\u014a\0\u03a2"+
"\0\u03c0\0\u03de\0\u03fc\0\u041a\0\u0438\0\u0456\0\u0474\0\u0492"+
"\0\u04b0\0\u032a\0\u04ce\0\u02ee\0\u032a\0\u04ec\0\u050a";
private static int [] zzUnpackRowMap() {
int [] result = new int[57];
int [] result = new int[63];
int offset = 0;
offset = zzUnpackRowMap(ZZ_ROWMAP_PACKED_0, offset, result);
return result;
@@ -203,43 +207,48 @@ class _JavaDocLexer implements FlexLexer {
private static final int [] ZZ_TRANS = zzUnpackTrans();
private static final String ZZ_TRANS_PACKED_0 =
"\6\14\1\15\1\16\26\14\1\17\2\20\4\17\1\21"+
"\5\17\1\22\6\17\1\23\7\17\1\24\1\20\1\17"+
"\1\20\1\25\4\17\1\21\14\17\1\23\7\17\1\24"+
"\1\20\1\14\2\26\4\14\1\16\24\14\1\24\1\26"+
"\1\14\2\27\4\14\1\16\25\14\1\27\1\17\2\30"+
"\2\31\2\17\1\21\1\31\1\32\1\17\1\33\1\34"+
"\1\17\4\31\1\35\2\17\7\31\1\24\1\30\1\14"+
"\2\20\2\31\2\14\1\16\1\31\1\14\1\36\1\14"+
"\1\34\1\14\4\31\3\14\7\31\1\14\1\20\4\14"+
"\1\37\2\14\1\16\6\14\4\37\1\14\1\40\1\14"+
"\7\37\11\14\1\16\5\14\1\41\20\14\1\42\2\43"+
"\4\42\1\44\14\42\1\23\7\42\1\24\1\45\1\42"+
"\2\43\4\42\1\44\24\42\1\24\1\45\45\0\1\46"+
"\34\0\1\47\1\50\27\0\2\20\32\0\1\20\4\0"+
"\1\51\11\0\1\52\3\51\3\0\7\51\4\0\1\25"+
"\34\0\2\26\32\0\1\26\1\0\2\27\32\0\1\27"+
"\1\0\2\30\32\0\1\30\3\0\2\31\3\0\1\31"+
"\5\0\4\31\3\0\7\31\5\0\3\37\10\0\4\37"+
"\3\0\7\37\6\0\1\51\11\0\1\52\3\51\3\0"+
"\1\53\3\51\1\54\2\51\3\0\2\45\32\0\1\45"+
"\7\0\1\55\31\0\3\51\10\0\4\51\3\0\7\51"+
"\5\0\3\51\10\0\1\51\1\56\2\51\3\0\7\51"+
"\5\0\3\51\10\0\4\51\3\0\1\51\1\57\5\51"+
"\5\0\3\51\10\0\4\51\3\0\5\51\1\60\1\51"+
"\5\0\3\51\10\0\2\51\1\61\1\51\3\0\7\51"+
"\5\0\3\51\10\0\4\51\3\0\2\51\1\62\4\51"+
"\5\0\3\51\10\0\4\51\3\0\6\51\1\63\5\0"+
"\3\51\10\0\1\51\1\64\2\51\3\0\7\51\5\0"+
"\3\51\10\0\4\51\3\0\3\51\1\65\3\51\5\0"+
"\3\51\10\0\4\51\3\0\3\51\1\66\3\51\5\0"+
"\3\51\10\0\3\51\1\67\3\0\7\51\5\0\3\51"+
"\10\0\2\51\1\70\1\51\3\0\7\51\5\0\3\51"+
"\10\0\1\51\1\71\2\51\3\0\7\51\5\0\3\51"+
"\10\0\4\51\3\0\4\51\1\65\2\51\2\0";
"\7\14\1\15\1\16\25\14\1\17\2\20\3\17\1\21"+
"\1\17\1\22\5\17\1\23\6\17\1\24\7\17\1\20"+
"\1\17\1\20\1\25\3\17\1\21\1\17\1\22\14\17"+
"\1\24\7\17\1\20\1\14\2\26\3\14\1\21\1\14"+
"\1\16\24\14\1\26\1\14\2\27\5\14\1\16\24\14"+
"\1\27\1\17\2\30\2\31\1\17\1\21\1\17\1\22"+
"\1\31\1\32\1\17\1\33\1\34\1\17\4\31\1\35"+
"\2\17\7\31\1\30\1\14\2\20\2\31\3\14\1\16"+
"\1\31\1\14\1\36\1\14\1\34\1\14\4\31\3\14"+
"\7\31\1\20\4\14\1\37\3\14\1\16\6\14\4\37"+
"\1\14\1\40\1\14\7\37\11\14\1\16\5\14\1\41"+
"\17\14\1\42\2\43\3\42\1\21\1\42\1\44\14\42"+
"\1\24\7\42\1\45\1\42\2\43\3\42\1\21\1\42"+
"\1\44\24\42\1\45\46\0\1\46\34\0\1\47\1\50"+
"\26\0\2\20\32\0\1\20\1\51\2\0\14\51\1\52"+
"\15\51\3\0\1\25\34\0\2\26\32\0\1\26\1\0"+
"\2\27\32\0\1\27\1\0\2\30\32\0\1\30\3\0"+
"\2\31\4\0\1\31\5\0\4\31\3\0\7\31\4\0"+
"\3\37\11\0\4\37\3\0\7\37\1\0\1\53\2\0"+
"\3\53\1\0\10\53\1\54\6\53\1\55\3\53\1\56"+
"\2\53\2\0\2\45\32\0\1\45\10\0\1\57\25\0"+
"\1\51\2\0\32\51\1\0\1\51\2\0\15\51\1\60"+
"\14\51\1\0\1\53\2\0\3\53\1\0\26\53\1\0"+
"\1\53\2\0\3\53\1\0\11\53\1\61\14\53\1\0"+
"\1\53\2\0\3\53\1\0\20\53\1\62\5\53\1\0"+
"\1\53\2\0\3\53\1\0\24\53\1\63\1\53\1\0"+
"\1\51\2\0\16\51\1\64\13\51\1\0\1\53\2\0"+
"\3\53\1\0\12\53\1\65\13\53\1\0\1\53\2\0"+
"\3\53\1\0\21\53\1\66\4\53\1\0\1\53\2\0"+
"\3\53\1\0\25\53\1\67\1\0\1\51\2\0\15\51"+
"\1\70\14\51\1\0\1\53\2\0\3\53\1\0\11\53"+
"\1\71\14\53\1\0\1\53\2\0\3\53\1\0\22\53"+
"\1\72\3\53\1\0\1\53\2\0\3\53\1\0\22\53"+
"\1\73\3\53\1\0\1\51\2\0\17\51\1\74\12\51"+
"\1\0\1\53\2\0\3\53\1\0\13\53\1\75\12\53"+
"\1\0\1\53\2\0\3\53\1\0\12\53\1\76\13\53"+
"\1\0\1\53\2\0\3\53\1\0\11\53\1\77\14\53"+
"\1\0\1\53\2\0\3\53\1\0\23\53\1\72\2\53"+
"\1\0";
private static int [] zzUnpackTrans() {
int [] result = new int[1170];
int [] result = new int[1320];
int offset = 0;
offset = zzUnpackTrans(ZZ_TRANS_PACKED_0, offset, result);
return result;
@@ -280,12 +289,12 @@ class _JavaDocLexer implements FlexLexer {
private static final int [] ZZ_ATTRIBUTE = zzUnpackAttribute();
private static final String ZZ_ATTRIBUTE_PACKED_0 =
"\13\0\1\11\2\1\1\11\3\1\2\11\5\1\5\11"+
"\1\1\1\11\1\1\1\11\3\1\1\0\1\11\1\0"+
"\4\1\1\11\14\1";
"\13\0\1\11\2\1\1\11\1\1\1\11\2\1\1\11"+
"\5\1\5\11\1\1\1\11\1\1\1\11\3\1\1\0"+
"\1\11\1\0\6\1\1\11\20\1";
private static int [] zzUnpackAttribute() {
int [] result = new int[57];
int [] result = new int[63];
int offset = 0;
offset = zzUnpackAttribute(ZZ_ATTRIBUTE_PACKED_0, offset, result);
return result;
@@ -365,19 +374,15 @@ class _JavaDocLexer implements FlexLexer {
}
/**
* Creates a new scanner
*
* @param in the java.io.Reader to read input from.
*/
_JavaDocLexer(java.io.Reader in) {
this.zzReader = in;
}
/**
* Creates a new scanner.
* There is also java.io.Reader version of this constructor.
*
* @param in the java.io.Inputstream to read input from.
*/
_JavaDocLexer(java.io.InputStream in) {
this(new java.io.InputStreamReader(in));
}
/**
* Unpacks the compressed character translation table.
@@ -389,7 +394,7 @@ class _JavaDocLexer implements FlexLexer {
char [] map = new char[0x10000];
int i = 0; /* index in packed string */
int j = 0; /* index in unpacked array */
while (i < 1270) {
while (i < 1662) {
int count = packed.charAt(i++);
char value = packed.charAt(i++);
do map[j++] = value; while (--count > 0);
@@ -631,25 +636,66 @@ class _JavaDocLexer implements FlexLexer {
{ return myTokenTypes.commentData();
}
case 28: break;
case 5:
case 4:
{ yybegin(COMMENT_DATA); return myTokenTypes.inlineTagEnd();
}
case 29: break;
case 4:
{ if (checkAhead('@')) {
yybegin(INLINE_TAG_NAME);
return myTokenTypes.inlineTagStart();
}
else{
yybegin(COMMENT_DATA);
return myTokenTypes.inlineTagStart();
}
}
case 30: break;
case 21:
{ yybegin(COMMENT_DATA_START); return myTokenTypes.commentStart();
}
case 30: break;
case 7:
{ if (checkAhead('<') || checkAhead('\"')) yybegin(COMMENT_DATA);
else if (checkAhead('\u007b') ) yybegin(COMMENT_DATA); // lbrace - there's a error in JLex when typing lbrace directly
else yybegin(DOC_TAG_VALUE);
return myTokenTypes.space();
}
case 31: break;
case 8:
{ yybegin(DOC_TAG_VALUE); return myTokenTypes.space();
}
case 32: break;
case 10:
{ return myTokenTypes.tagValueToken();
}
case 33: break;
case 20:
{ yybegin(TAG_DOC_SPACE); return myTokenTypes.tagName();
}
case 34: break;
case 18:
{ yybegin(CODE_TAG);
return myTokenTypes.space();
}
case 35: break;
case 9:
{ yybegin(COMMENT_DATA); return myTokenTypes.space();
}
case 36: break;
case 23:
{ yybegin(PARAM_TAG_SPACE); return myTokenTypes.tagName();
}
case 37: break;
case 22:
{ yybegin(CODE_TAG_SPACE); return myTokenTypes.tagName();
}
case 38: break;
case 1:
{ return myTokenTypes.badCharacter();
}
case 39: break;
case 15:
{ yybegin(DOC_TAG_VALUE); return myTokenTypes.tagValueRParen();
}
case 40: break;
case 11:
{ yybegin(DOC_TAG_VALUE_IN_PAREN); return myTokenTypes.tagValueLParen();
}
case 41: break;
case 13:
{ return myTokenTypes.tagValueComma();
}
case 42: break;
case 14:
{ if (myJdk15Enabled) {
yybegin(DOC_TAG_VALUE_IN_LTGT);
@@ -660,57 +706,16 @@ class _JavaDocLexer implements FlexLexer {
return myTokenTypes.commentData();
}
}
case 32: break;
case 18:
{ yybegin(CODE_TAG);
return myTokenTypes.space();
}
case 33: break;
case 8:
{ yybegin(DOC_TAG_VALUE); return myTokenTypes.space();
}
case 34: break;
case 10:
{ return myTokenTypes.tagValueToken();
}
case 35: break;
case 20:
{ yybegin(TAG_DOC_SPACE); return myTokenTypes.tagName();
}
case 36: break;
case 9:
{ yybegin(COMMENT_DATA); return myTokenTypes.space();
}
case 37: break;
case 23:
{ yybegin(PARAM_TAG_SPACE); return myTokenTypes.tagName();
}
case 38: break;
case 22:
{ yybegin(CODE_TAG_SPACE); return myTokenTypes.tagName();
}
case 39: break;
case 7:
{ if (checkAhead('<') || checkAhead('\"')) yybegin(COMMENT_DATA);
else if (checkAhead('\u007b') ) yybegin(COMMENT_DATA); // lbrace - there's a error in JLex when typing lbrace directly
else yybegin(DOC_TAG_VALUE);
return myTokenTypes.space();
}
case 40: break;
case 1:
{ return myTokenTypes.badCharacter();
}
case 41: break;
case 15:
{ yybegin(DOC_TAG_VALUE); return myTokenTypes.tagValueRParen();
}
case 42: break;
case 11:
{ yybegin(DOC_TAG_VALUE_IN_PAREN); return myTokenTypes.tagValueLParen();
}
case 43: break;
case 13:
{ return myTokenTypes.tagValueComma();
case 5:
{ if (checkAhead('@')) {
yybegin(INLINE_TAG_NAME);
return myTokenTypes.inlineTagStart();
}
else{
yybegin(COMMENT_DATA);
return myTokenTypes.inlineTagStart();
}
}
case 44: break;
case 2:
java/java-psi-impl/src/com/intellij/codeInsight/javadoc/JavaDocInfoGenerator.java
-3
View File
@@ -1264,9 +1264,6 @@ public class JavaDocInfoGenerator {
else if (tagName.equals(VALUE_TAG)) {
generateValueValue(tag, buffer, element);
}
else {
buffer.append(element.getText());
}
}
else {
buffer.append(StringUtil.replaceUnicodeEscapeSequences(element.getText()));
java/java-psi-impl/src/com/intellij/lang/java/lexer/_JavaDocLexer.flex
+4 -2
View File
@@ -54,6 +54,8 @@ WHITE_DOC_SPACE_NO_LR=[\ \t\f]
DIGIT=[0-9]
ALPHA=[:jletter:]
IDENTIFIER={ALPHA}({ALPHA}|{DIGIT}|[":.-"])*
TAG_IDENTIFIER=[^\ \t\f\n\r]+
INLINE_TAG_IDENTIFIER=[^\ \t\f\n\r\}]+
%%
@@ -98,12 +100,12 @@ IDENTIFIER={ALPHA}({ALPHA}|{DIGIT}|[":.-"])*
}
<INLINE_TAG_NAME> "@code" { yybegin(CODE_TAG_SPACE); return myTokenTypes.tagName(); }
<INLINE_TAG_NAME> "@literal" { yybegin(CODE_TAG_SPACE); return myTokenTypes.tagName(); }
<INLINE_TAG_NAME> "@"{IDENTIFIER} { yybegin(TAG_DOC_SPACE); return myTokenTypes.tagName(); }
<INLINE_TAG_NAME> "@"{INLINE_TAG_IDENTIFIER} { yybegin(TAG_DOC_SPACE); return myTokenTypes.tagName(); }
<COMMENT_DATA_START, COMMENT_DATA, TAG_DOC_SPACE, DOC_TAG_VALUE, CODE_TAG, CODE_TAG_SPACE> "}" { yybegin(COMMENT_DATA); return myTokenTypes.inlineTagEnd(); }
<COMMENT_DATA_START, COMMENT_DATA, DOC_TAG_VALUE> . { yybegin(COMMENT_DATA); return myTokenTypes.commentData(); }
<CODE_TAG, CODE_TAG_SPACE> . { yybegin(CODE_TAG); return myTokenTypes.commentData(); }
<COMMENT_DATA_START> "@"{IDENTIFIER} { yybegin(TAG_DOC_SPACE); return myTokenTypes.tagName(); }
<COMMENT_DATA_START> "@"{TAG_IDENTIFIER} { yybegin(TAG_DOC_SPACE); return myTokenTypes.tagName(); }
<TAG_DOC_SPACE> {WHITE_DOC_SPACE_CHAR}+ {
if (checkAhead('<') || checkAhead('\"')) yybegin(COMMENT_DATA);
java/java-tests/testData/codeInsight/javadocIG/noSpaceAfterTagName.html
+2
View File
@@ -0,0 +1,2 @@
<html><head><base href="placeholder"> <style type="text/css"> #error { background-color: #eeeeee; margin-bottom: 10px; } p { margin: 5px 0; } </style></head><body><PRE>class <b>Foo</b>
extends <a href="psi_element://java.lang.Object"><code>Object</code></a></PRE> foobar</body></html>
java/java-tests/testData/codeInsight/javadocIG/noSpaceAfterTagName.java
+2
View File
@@ -0,0 +1,2 @@
/** foo{@literal@tag}bar */
class Foo {}
java/java-tests/testSrc/com/intellij/codeInsight/javadoc/JavaDocInfoGeneratorTest.java
+4
View File
@@ -159,6 +159,10 @@ public class JavaDocInfoGeneratorTest extends CodeInsightTestCase {
assertNotNull(docInfo);
assertEquals(exampleHtmlFileText(getTestName(true)), replaceEnvironmentDependentContent(docInfo));
}
public void testNoSpaceAfterTagName() throws Exception {
verifyJavaDoc(getTestClass());
}
private static String exampleHtmlFileText(String name) throws IOException {
final File htmlPath = new File(JavaTestUtil.getJavaTestDataPath() + "/codeInsight/javadocIG/" + name + ".html");