mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-29 19:45:01 +02:00
Code Issues Wiki Activity

Fix for 100656: ArrayIndexOutOfBoundsException in hover

Browse source
This commit is contained in:
Bogdan Gheorghe 2005-06-28 18:50:11 +00:00
parent 371443e780
commit 2829a3708b
1 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/c/hover/CSourceHover.java
View file

@ -12,6 +12,7 @@
package org.eclipse.cdt.internal.ui.text.c.hover; package org.eclipse.cdt.internal.ui.text.c.hover;
import java.io.IOException; import java.io.IOException;
import java.util.Iterator;
import java.util.Set; import java.util.Set;
import org.eclipse.cdt.core.model.CModelException; import org.eclipse.cdt.core.model.CModelException;
@ -21,6 +22,9 @@ import org.eclipse.cdt.core.model.ICProject;
import org.eclipse.cdt.core.model.ISourceReference; import org.eclipse.cdt.core.model.ISourceReference;
import org.eclipse.cdt.core.model.ITranslationUnit; import org.eclipse.cdt.core.model.ITranslationUnit;
import org.eclipse.cdt.core.model.IWorkingCopy; import org.eclipse.cdt.core.model.IWorkingCopy;
import org.eclipse.cdt.core.parser.KeywordSetKey;
import org.eclipse.cdt.core.parser.ParserFactory;
import org.eclipse.cdt.core.parser.ParserLanguage;
import org.eclipse.cdt.core.search.BasicSearchResultCollector; import org.eclipse.cdt.core.search.BasicSearchResultCollector;
import org.eclipse.cdt.core.search.ICSearchConstants; import org.eclipse.cdt.core.search.ICSearchConstants;
import org.eclipse.cdt.core.search.ICSearchScope; import org.eclipse.cdt.core.search.ICSearchScope;
@ -161,7 +165,12 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
IEditorInput input= editor.getEditorInput(); IEditorInput input= editor.getEditorInput();
IWorkingCopyManager manager= CUIPlugin.getDefault().getWorkingCopyManager(); IWorkingCopyManager manager= CUIPlugin.getDefault().getWorkingCopyManager();
IWorkingCopy copy = manager.getWorkingCopy(input); IWorkingCopy copy = manager.getWorkingCopy(input);
//Before trying a search lets make sure that the user is not hovering over a keyword (which will
//result in null being returned)
if (selectionIsKeyword(name))
return null;
if (copy != null) { if (copy != null) {
try { try {
BasicSearchResultCollector searchResultCollector = new BasicSearchResultCollector(); BasicSearchResultCollector searchResultCollector = new BasicSearchResultCollector();
@ -238,6 +247,15 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
} }
private boolean selectionIsKeyword(String name) {
Set keywords =ParserFactory.getKeywordSet(KeywordSetKey.KEYWORDS, ParserLanguage.CPP );
if (keywords.contains(name))
return true;
return false;
}
/* /*
* @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator() * @see org.eclipse.jface.text.ITextHoverExtension#getHoverControlCreator()
* @since 3.0 * @since 3.0