mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

Default Source Hover modifier is Shift

Browse source
This commit is contained in:
Anton Leherbauer 2007-04-11 14:16:14 +00:00
parent 49aaf4cd87
commit 386726e1fc
2 changed files with 173 additions and 142 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -260,138 +260,36 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
ITextFileBufferManager mgr= FileBuffers.getTextFileBufferManager(); ITextFileBufferManager mgr= FileBuffers.getTextFileBufferManager();
mgr.connect(location, locationKind, fMonitor); mgr.connect(location, locationKind, fMonitor);
ITextFileBuffer buffer= mgr.getTextFileBuffer(location, locationKind); ITextFileBuffer buffer= mgr.getTextFileBuffer(location, locationKind);
String source;
try { try {
IRegion nameRegion= new Region(fileLocation.getNodeOffset(), fileLocation.getNodeLength()); IRegion nameRegion= new Region(fileLocation.getNodeOffset(), fileLocation.getNodeLength());
final int nameOffset= nameRegion.getOffset(); final int nameOffset= nameRegion.getOffset();
int sourceStart= nameOffset; final int sourceStart;
int sourceEnd= nameOffset + nameRegion.getLength(); final int sourceEnd;
IDocument doc= buffer.getDocument(); IDocument doc= buffer.getDocument();
// expand source range to include preceding comment, if any
CHeuristicScanner scanner= new CHeuristicScanner(doc);
if (binding instanceof IParameter) {
sourceStart= scanner.scanBackward(nameOffset, CHeuristicScanner.UNBOUND, new char[] { '(', ',' });
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
return null;
}
sourceStart= scanner.findNonWhitespaceForward(sourceStart + 1, nameOffset);
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
sourceStart = nameOffset;
}
} else if (binding instanceof ICPPTemplateParameter) {
sourceStart= scanner.scanBackward(nameOffset, CHeuristicScanner.UNBOUND, new char[] { '<', ',' });
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
return null;
}
sourceStart= scanner.findNonWhitespaceForward(sourceStart + 1, nameOffset);
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
sourceStart = nameOffset;
}
} else if (binding instanceof IEnumerator) {
sourceStart= scanner.scanBackward(nameOffset, CHeuristicScanner.UNBOUND, new char[] { '{', ',' });
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
return null;
}
sourceStart= scanner.findNonWhitespaceForward(sourceStart + 1, nameOffset);
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
sourceStart = nameOffset;
}
} else {
final int nameLine= doc.getLineOfOffset(nameOffset);
sourceStart= doc.getLineOffset(nameLine);
int commentBound= scanner.scanBackward(sourceStart, CHeuristicScanner.UNBOUND, new char[] { '{', '}', ';' });
if (commentBound == CHeuristicScanner.NOT_FOUND) {
commentBound= -1; // unbound
}
int commentStart= searchCommentBackward(doc, sourceStart, commentBound);
if (commentStart >= 0) {
sourceStart= commentStart;
} else {
int nextNonWS= scanner.findNonWhitespaceForward(commentBound+1, sourceStart);
if (nextNonWS != CHeuristicScanner.NOT_FOUND) {
int nextNonWSLine= doc.getLineOfOffset(nextNonWS);
int lineOffset= doc.getLineOffset(nextNonWSLine);
if (doc.get(lineOffset, nextNonWS - lineOffset).trim().length() == 0) {
sourceStart= doc.getLineOffset(nextNonWSLine);
}
}
}
}
// expand forward to the end of the definition/declaration
if (binding instanceof IMacroBinding) { if (binding instanceof IMacroBinding) {
ITypedRegion partition= TextUtilities.getPartition(doc, ICPartitions.C_PARTITIONING, nameOffset, false); ITypedRegion partition= TextUtilities.getPartition(doc, ICPartitions.C_PARTITIONING, nameOffset, false);
if (ICPartitions.C_PREPROCESSOR.equals(partition.getType())) { if (ICPartitions.C_PREPROCESSOR.equals(partition.getType())) {
sourceStart= partition.getOffset(); int directiveStart= partition.getOffset();
sourceEnd= sourceStart + partition.getLength(); int commentStart= searchCommentBackward(doc, directiveStart, -1);
} if (commentStart >= 0) {
} else { sourceStart= commentStart;
boolean searchBrace= false;
boolean searchSemi= false;
boolean searchComma= false;
if (binding instanceof ICompositeType || binding instanceof IEnumeration) {
searchBrace= true;
} else if (binding instanceof ICPPTemplateDefinition) {
searchBrace= true;
} else if (binding instanceof IFunction && name.isDefinition()) {
searchBrace= true;
} else if (binding instanceof IParameter || binding instanceof IEnumerator || binding instanceof ICPPTemplateParameter) {
searchComma= true;
} else if (binding instanceof IVariable || binding instanceof ITypedef) {
searchSemi= true;
} else if (!name.isDefinition()) {
searchSemi= true;
}
if (searchBrace) {
int brace= scanner.scanForward(nameOffset, CHeuristicScanner.UNBOUND, '{');
if (brace != CHeuristicScanner.NOT_FOUND) {
sourceEnd= scanner.findClosingPeer(brace + 1, '{', '}');
if (sourceEnd == CHeuristicScanner.NOT_FOUND) {
sourceEnd= doc.getLength();
}
}
// expand region to include whole line
IRegion lineRegion= doc.getLineInformationOfOffset(sourceEnd);
sourceEnd= lineRegion.getOffset() + lineRegion.getLength();
} else if (searchSemi) {
int semi= scanner.scanForward(nameOffset, CHeuristicScanner.UNBOUND, ';');
if (semi != CHeuristicScanner.NOT_FOUND) {
sourceEnd= semi+1;
}
// expand region to include whole line
IRegion lineRegion= doc.getLineInformationOfOffset(sourceEnd);
sourceEnd= lineRegion.getOffset() + lineRegion.getLength();
} else if (searchComma) {
int bound;
if (binding instanceof IParameter) {
bound= scanner.findClosingPeer(nameOffset, '(', ')');
} else if (binding instanceof ICPPTemplateParameter) {
bound= scanner.findClosingPeer(nameOffset, '<', '>');
} else if (binding instanceof IEnumerator) {
bound= scanner.findClosingPeer(nameOffset, '{', '}');
} else { } else {
bound = CHeuristicScanner.NOT_FOUND; sourceStart= directiveStart;
}
if (bound == CHeuristicScanner.NOT_FOUND) {
bound= Math.min(doc.getLength(), nameOffset + 100);
}
int comma= scanner.scanForward(nameOffset, bound, ',');
if (comma == CHeuristicScanner.NOT_FOUND) {
sourceEnd= bound;
} else {
sourceEnd= comma;
}
// expand region to include whole line if rest is white space or comment
int nextNonWS= scanner.findNonWhitespaceForward(sourceEnd + 1, CHeuristicScanner.UNBOUND);
if (doc.getLineOfOffset(nextNonWS) > doc.getLineOfOffset(sourceEnd)) {
IRegion lineRegion= doc.getLineInformationOfOffset(sourceEnd);
sourceEnd= lineRegion.getOffset() + lineRegion.getLength();
} }
sourceEnd= directiveStart + partition.getLength();
} else { } else {
return null;
} }
} else {
// expand source range to include preceding comment, if any
sourceStart= computeSourceStart(doc, nameOffset, binding);
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
return null;
}
sourceEnd= computeSourceEnd(doc, nameOffset + nameRegion.getLength(), binding, name.isDefinition());
} }
String source= buffer.getDocument().get(sourceStart, sourceEnd - sourceStart);
source= buffer.getDocument().get(sourceStart, sourceEnd - sourceStart);
return source; return source;
} catch (BadLocationException exc) { } catch (BadLocationException exc) {
@ -403,6 +301,146 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
return null; return null;
} }
private int computeSourceStart(IDocument doc, int nameOffset, IBinding binding) throws BadLocationException {
int sourceStart= nameOffset;
CHeuristicScanner scanner= new CHeuristicScanner(doc);
if (binding instanceof IParameter) {
sourceStart= scanner.scanBackward(nameOffset, CHeuristicScanner.UNBOUND, new char[] { '>', '(', ',' });
if (sourceStart > 0 && doc.getChar(sourceStart) == '>') {
sourceStart= scanner.findOpeningPeer(sourceStart - 1, '<', '>');
if (sourceStart > 0) {
sourceStart= scanner.scanBackward(sourceStart, CHeuristicScanner.UNBOUND, new char[] { '(', ',' });
}
}
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
return sourceStart;
}
sourceStart= scanner.findNonWhitespaceForward(sourceStart + 1, nameOffset);
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
sourceStart = nameOffset;
}
} else if (binding instanceof ICPPTemplateParameter) {
sourceStart= scanner.scanBackward(nameOffset, CHeuristicScanner.UNBOUND, new char[] { '>', '<', ',' });
if (sourceStart > 0 && doc.getChar(sourceStart) == '>') {
sourceStart= scanner.findOpeningPeer(sourceStart - 1, '<', '>');
if (sourceStart > 0) {
sourceStart= scanner.scanBackward(sourceStart, CHeuristicScanner.UNBOUND, new char[] { '<', ',' });
}
}
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
return sourceStart;
}
sourceStart= scanner.findNonWhitespaceForward(sourceStart + 1, nameOffset);
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
sourceStart = nameOffset;
}
} else if (binding instanceof IEnumerator) {
sourceStart= scanner.scanBackward(nameOffset, CHeuristicScanner.UNBOUND, new char[] { '{', ',' });
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
return sourceStart;
}
sourceStart= scanner.findNonWhitespaceForward(sourceStart + 1, nameOffset);
if (sourceStart == CHeuristicScanner.NOT_FOUND) {
sourceStart = nameOffset;
}
} else {
final int nameLine= doc.getLineOfOffset(nameOffset);
sourceStart= doc.getLineOffset(nameLine);
int commentBound= scanner.scanBackward(sourceStart, CHeuristicScanner.UNBOUND, new char[] { '{', '}', ';' });
if (commentBound == CHeuristicScanner.NOT_FOUND) {
commentBound= -1; // unbound
}
int commentStart= searchCommentBackward(doc, sourceStart, commentBound);
if (commentStart >= 0) {
sourceStart= commentStart;
} else {
int nextNonWS= scanner.findNonWhitespaceForward(commentBound+1, sourceStart);
if (nextNonWS != CHeuristicScanner.NOT_FOUND) {
int nextNonWSLine= doc.getLineOfOffset(nextNonWS);
int lineOffset= doc.getLineOffset(nextNonWSLine);
if (doc.get(lineOffset, nextNonWS - lineOffset).trim().length() == 0) {
sourceStart= doc.getLineOffset(nextNonWSLine);
}
}
}
}
return sourceStart;
}
private int computeSourceEnd(IDocument doc, int start, IBinding binding, boolean isDefinition) throws BadLocationException {
int sourceEnd= start;
CHeuristicScanner scanner= new CHeuristicScanner(doc);
// expand forward to the end of the definition/declaration
boolean searchBrace= false;
boolean searchSemi= false;
boolean searchComma= false;
if (binding instanceof ICompositeType || binding instanceof IEnumeration) {
searchBrace= true;
} else if (binding instanceof ICPPTemplateDefinition) {
searchBrace= true;
} else if (binding instanceof IFunction && isDefinition) {
searchBrace= true;
} else if (binding instanceof IParameter || binding instanceof IEnumerator || binding instanceof ICPPTemplateParameter) {
searchComma= true;
} else if (binding instanceof IVariable || binding instanceof ITypedef) {
searchSemi= true;
} else if (!isDefinition) {
searchSemi= true;
}
if (searchBrace) {
int brace= scanner.scanForward(start, CHeuristicScanner.UNBOUND, '{');
if (brace != CHeuristicScanner.NOT_FOUND) {
sourceEnd= scanner.findClosingPeer(brace + 1, '{', '}');
if (sourceEnd == CHeuristicScanner.NOT_FOUND) {
sourceEnd= doc.getLength();
}
}
// expand region to include whole line
IRegion lineRegion= doc.getLineInformationOfOffset(sourceEnd);
sourceEnd= lineRegion.getOffset() + lineRegion.getLength();
} else if (searchSemi) {
int semi= scanner.scanForward(start, CHeuristicScanner.UNBOUND, ';');
if (semi != CHeuristicScanner.NOT_FOUND) {
sourceEnd= semi+1;
}
// expand region to include whole line
IRegion lineRegion= doc.getLineInformationOfOffset(sourceEnd);
sourceEnd= lineRegion.getOffset() + lineRegion.getLength();
} else if (searchComma) {
int bound;
if (binding instanceof IParameter) {
bound= scanner.findClosingPeer(start, '(', ')');
} else if (binding instanceof ICPPTemplateParameter) {
bound= scanner.findClosingPeer(start, '<', '>');
} else if (binding instanceof IEnumerator) {
bound= scanner.findClosingPeer(start, '{', '}');
} else {
bound = CHeuristicScanner.NOT_FOUND;
}
if (bound == CHeuristicScanner.NOT_FOUND) {
bound= Math.min(doc.getLength(), start + 100);
}
int comma= scanner.scanForward(start, bound, ',');
if (comma == CHeuristicScanner.NOT_FOUND) {
// last argument
sourceEnd= bound;
} else {
sourceEnd= comma;
// expand region to include whole line if rest is comment
IRegion lineRegion= doc.getLineInformationOfOffset(sourceEnd);
int lineEnd= lineRegion.getOffset() + lineRegion.getLength();
int nextNonWS= scanner.findNonWhitespaceForwardInAnyPartition(sourceEnd + 1, lineEnd);
if (nextNonWS != CHeuristicScanner.NOT_FOUND) {
String contentType= TextUtilities.getContentType(doc, ICPartitions.C_PARTITIONING, nextNonWS, true);
if (ICPartitions.C_MULTI_LINE_COMMENT.equals(contentType) || ICPartitions.C_SINGLE_LINE_COMMENT.equals(contentType)) {
sourceEnd= lineEnd;
}
}
}
}
return sourceEnd;
}
/** /**
* Search for definitions for the given binding. * Search for definitions for the given binding.
* *
@ -482,9 +520,10 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
String source= null; String source= null;
// Try with the indexer // Try with the indexer
source= searchInIndex(hoverRegion); source= searchInIndex(copy, hoverRegion);
if (source == null) { if (source == null) {
// Try with CModel
ICElement curr = copy.getElement(expression); ICElement curr = copy.getElement(expression);
if (curr != null) { if (curr != null) {
source= getSourceForCElement(textViewer.getDocument(), curr); source= getSourceForCElement(textViewer.getDocument(), curr);
@ -639,21 +678,11 @@ public class CSourceHover extends AbstractCEditorTextHover implements ITextHover
return source.substring(i); return source.substring(i);
} }
private String searchInIndex(IRegion textRegion) { private String searchInIndex(ITranslationUnit tUnit, IRegion textRegion) {
IEditorPart editor = getEditor(); IProgressMonitor monitor= new NullProgressMonitor();
if (editor != null) { ComputeSourceRunnable computer= new ComputeSourceRunnable(tUnit, textRegion);
IEditorInput input= editor.getEditorInput(); ASTProvider.getASTProvider().runOnAST(tUnit, ASTProvider.WAIT_ACTIVE_ONLY, monitor, computer);
IWorkingCopyManager manager= CUIPlugin.getDefault().getWorkingCopyManager(); return computer.getSource();
IWorkingCopy copy= manager.getWorkingCopy(input);
if (copy != null) {
IProgressMonitor monitor= new NullProgressMonitor();
ComputeSourceRunnable computer= new ComputeSourceRunnable(copy, textRegion);
ASTProvider.getASTProvider().runOnAST(copy, ASTProvider.WAIT_ACTIVE_ONLY, monitor, computer);
return computer.getSource();
}
}
return null;
} }

14
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/ui/PreferenceConstants.java
View file

@ -17,6 +17,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.preference.PreferenceConverter; import org.eclipse.jface.preference.PreferenceConverter;
import org.eclipse.swt.SWT; import org.eclipse.swt.SWT;
import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.graphics.RGB;
import org.eclipse.ui.texteditor.AbstractDecoratedTextEditorPreferenceConstants;
import org.eclipse.cdt.internal.ui.text.ICColorConstants; import org.eclipse.cdt.internal.ui.text.ICColorConstants;
@ -821,8 +822,9 @@ public class PreferenceConstants {
* A named preference that defines whether the hint to make hover sticky should be shown. * A named preference that defines whether the hint to make hover sticky should be shown.
* *
* @since 3.1.1 * @since 3.1.1
* @deprecated As of 4.0, replaced by {@link AbstractDecoratedTextEditorPreferenceConstants#EDITOR_SHOW_TEXT_HOVER_AFFORDANCE}
*/ */
public static final String EDITOR_SHOW_TEXT_HOVER_AFFORDANCE= "PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE"; //$NON-NLS-1$ public static final String EDITOR_SHOW_TEXT_HOVER_AFFORDANCE= AbstractDecoratedTextEditorPreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE;
/** /**
* A named preference prefix for semantic highlighting preferences. * A named preference prefix for semantic highlighting preferences.
@ -925,12 +927,11 @@ public class PreferenceConstants {
// Turned off by default since there are too many false reports right now // Turned off by default since there are too many false reports right now
store.setDefault(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS, false); store.setDefault(PreferenceConstants.EDITOR_EVALUATE_TEMPORARY_PROBLEMS, false);
String mod1Name= Action.findModifierString(SWT.MOD1); // SWT.COMMAND on Mac; SWT.CONTROL elsewhere int sourceHoverModifier= SWT.MOD2;
store.setDefault(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIERS, "org.eclipse.cdt.ui.BestMatchHover;0;org.eclipse.cdt.ui.CSourceHover;" + mod1Name); //$NON-NLS-1$ String sourceHoverModifierName= Action.findModifierString(sourceHoverModifier); // Shift
store.setDefault(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIER_MASKS, "org.eclipse.cdt.ui.BestMatchHover;0;org.eclipse.cdt.ui.CSourceHover;" + SWT.MOD1); //$NON-NLS-1$ store.setDefault(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIERS, "org.eclipse.cdt.ui.BestMatchHover;0;org.eclipse.cdt.ui.CSourceHover;" + sourceHoverModifierName); //$NON-NLS-1$
store.setDefault(PreferenceConstants.EDITOR_TEXT_HOVER_MODIFIER_MASKS, "org.eclipse.cdt.ui.BestMatchHover;0;org.eclipse.cdt.ui.CSourceHover;" + sourceHoverModifier); //$NON-NLS-1$
store.setDefault(PreferenceConstants.EDITOR_SHOW_TEXT_HOVER_AFFORDANCE, true);
// coloring // coloring
PreferenceConverter.setDefault(store, EDITOR_MULTI_LINE_COMMENT_COLOR, new RGB(63, 127, 95)); PreferenceConverter.setDefault(store, EDITOR_MULTI_LINE_COMMENT_COLOR, new RGB(63, 127, 95));
store.setDefault(EDITOR_MULTI_LINE_COMMENT_BOLD, false); store.setDefault(EDITOR_MULTI_LINE_COMMENT_BOLD, false);
@ -996,6 +997,7 @@ public class PreferenceConstants {
store.setDefault(PreferenceConstants.EDITOR_FOLDING_INACTIVE_CODE, true); store.setDefault(PreferenceConstants.EDITOR_FOLDING_INACTIVE_CODE, true);
store.setDefault(PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED, false); store.setDefault(PreferenceConstants.EDITOR_FOLDING_PREPROCESSOR_BRANCHES_ENABLED, false);
// smart edit
store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS, true); store.setDefault(PreferenceConstants.EDITOR_CLOSE_STRINGS, true);
store.setDefault(PreferenceConstants.EDITOR_CLOSE_BRACKETS, true); store.setDefault(PreferenceConstants.EDITOR_CLOSE_BRACKETS, true);
store.setDefault(PreferenceConstants.EDITOR_CLOSE_ANGULAR_BRACKETS, true); store.setDefault(PreferenceConstants.EDITOR_CLOSE_ANGULAR_BRACKETS, true);