mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-07-16 05:25:21 +02:00
Code Issues Wiki Activity

Bug 541117 - NPE in CElementHyperlinkDetector.isLanguageKeyword

Browse source 
Change-Id: I4bd2155de5aa7a09cb9e68f57e1168bdaab76401
This commit is contained in:
Nathan Ridge 2018-11-15 21:50:40 -05:00
parent 0c7b32c0dd
commit ac68d83566
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/CElementHyperlinkDetector.java
View file

@ -206,12 +206,14 @@ public class CElementHyperlinkDetector extends AbstractHyperlinkDetector {
*/
private static IRegion getIdentifier(IDocument document, int offset, ILanguage language)
throws BadLocationException {
IRegion wordRegion = CWordFinder.findWord(document, offset);
if (wordRegion != null && wordRegion.getLength() > 0) {
String word = document.get(wordRegion.getOffset(), wordRegion.getLength());
if (!Character.isDigit(word.charAt(0))) {
if (SemanticUtil.isAutoOrDecltype(word) || !isLanguageKeyword(language, word)) {
return wordRegion;
if (language != null) {
IRegion wordRegion = CWordFinder.findWord(document, offset);
if (wordRegion != null && wordRegion.getLength() > 0) {
String word = document.get(wordRegion.getOffset(), wordRegion.getLength());
if (!Character.isDigit(word.charAt(0))) {
if (SemanticUtil.isAutoOrDecltype(word) || !isLanguageKeyword(language, word)) {
return wordRegion;
}
}
}
}