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

WEB-6700 TODOs not recognized on multiple level language template

Browse Source
This commit is contained in:
Maxim.Mossienko
2013-12-24 17:51:26 +01:00
parent 4548db3b7c
commit 9d008109b5
3 changed files with 4 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/id/PlatformIdTableBuilding.java
Vendored
+1 -1
View File
@@ -163,7 +163,7 @@ public abstract class PlatformIdTableBuilding {
highlighter = editorHighlighter;
}
else {
highlighter = HighlighterFactory.createHighlighter(null, myFile);
highlighter = HighlighterFactory.createHighlighter(inputData.getProject(), myFile);
highlighter.setText(chars);
}
platform/editor-ui-ex/src/com/intellij/psi/impl/cache/impl/todo/TodoIndex.java
Vendored
+1 -1
View File
@@ -131,7 +131,7 @@ public class TodoIndex extends FileBasedIndexExtension<TodoIndexEntry, Integer>
@Override
public int getVersion() {
return 5;
return 6;
}
@Override
platform/editor-ui-ex/src/com/intellij/psi/impl/search/IndexPatternSearcher.java
+2 -9
View File
@@ -29,6 +29,7 @@ import com.intellij.openapi.progress.ProgressManager;
import com.intellij.openapi.util.TextRange;
import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.psi.*;
import com.intellij.psi.impl.cache.CacheUtil;
import com.intellij.psi.impl.cache.TodoCacheManager;
import com.intellij.psi.search.IndexPattern;
import com.intellij.psi.search.IndexPatternOccurrence;
@@ -187,15 +188,7 @@ public class IndexPatternSearcher implements QueryExecutor<IndexPatternOccurrenc
if (lexer.getTokenStart() >= range.getEndOffset()) break;
}
boolean isComment = commentTokens.contains(tokenType);
if (!isComment) {
final Language commentLang = tokenType.getLanguage();
final ParserDefinition parserDefinition = LanguageParserDefinitions.INSTANCE.forLanguage(commentLang);
if (parserDefinition != null) {
final TokenSet langCommentTokens = parserDefinition.getCommentTokens();
isComment = langCommentTokens.contains(tokenType);
}
}
boolean isComment = commentTokens.contains(tokenType) || CacheUtil.isInComments(tokenType);
if (isComment) {
final int startDelta = builderForFile != null ? builderForFile.getCommentStartDelta(lexer.getTokenType()) : 0;