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

bug 295625: Error highlighting in Build Console

Browse source 
Patch from Dmitry Kozlov
This commit is contained in:
Andrew Gvozdev 2010-03-02 14:11:44 +00:00
parent e9e73680c2
commit 67adea10b6
1 changed files with 40 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/buildconsole/BuildConsoleViewer.java
View file

@ -33,10 +33,10 @@ import org.eclipse.swt.widgets.Composite;
import org.eclipse.cdt.ui.CUIPlugin; import org.eclipse.cdt.ui.CUIPlugin;
public class BuildConsoleViewer extends TextViewer public class BuildConsoleViewer extends TextViewer
implements LineStyleListener, implements LineStyleListener,
LineBackgroundListener, LineBackgroundListener,
MouseTrackListener, MouseTrackListener,
MouseListener { MouseListener {
protected InternalDocumentListener fInternalDocumentListener = new InternalDocumentListener(); protected InternalDocumentListener fInternalDocumentListener = new InternalDocumentListener();
@ -51,7 +51,7 @@ public class BuildConsoleViewer extends TextViewer
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent) * @see org.eclipse.jface.text.IDocumentListener#documentAboutToBeChanged(org.eclipse.jface.text.DocumentEvent)
*/ */
public void documentAboutToBeChanged(DocumentEvent e) { public void documentAboutToBeChanged(DocumentEvent e) {
@ -59,18 +59,18 @@ public class BuildConsoleViewer extends TextViewer
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent) * @see org.eclipse.jface.text.IDocumentListener#documentChanged(org.eclipse.jface.text.DocumentEvent)
*/ */
public void documentChanged(DocumentEvent e) { public void documentChanged(DocumentEvent e) {
revealEndOfDocument(); revealEndOfDocument();
} }
} }
/** /**
* Sets whether this viewer should auto-scroll as output is appended to the * Sets whether this viewer should auto-scroll as output is appended to the
* document. * document.
* *
* @param scroll * @param scroll
*/ */
public void setAutoScroll(boolean scroll) { public void setAutoScroll(boolean scroll) {
@ -89,7 +89,7 @@ public class BuildConsoleViewer extends TextViewer
* Creates a new console viewer and adds verification checking to only * Creates a new console viewer and adds verification checking to only
* allow text modification if the text is being modified in the editable * allow text modification if the text is being modified in the editable
* portion of the underlying document. * portion of the underlying document.
* *
* @see org.eclipse.swt.events.VerifyListener * @see org.eclipse.swt.events.VerifyListener
*/ */
public BuildConsoleViewer(Composite parent) { public BuildConsoleViewer(Composite parent) {
@ -135,10 +135,10 @@ public class BuildConsoleViewer extends TextViewer
} }
} }
} }
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see org.eclipse.jface.text.ITextViewer#setDocument(org.eclipse.jface.text.IDocument) * @see org.eclipse.jface.text.ITextViewer#setDocument(org.eclipse.jface.text.IDocument)
*/ */
@Override @Override
@ -165,84 +165,86 @@ public class BuildConsoleViewer extends TextViewer
/* /*
* (non-Javadoc) * (non-Javadoc)
* *
* @see org.eclipse.swt.custom.LineStyleListener#lineGetStyle(org.eclipse.swt.custom.LineStyleEvent) * @see org.eclipse.swt.custom.LineStyleListener#lineGetStyle(org.eclipse.swt.custom.LineStyleEvent)
*/ */
public void lineGetStyle(LineStyleEvent event) { public void lineGetStyle(LineStyleEvent event) {
IDocument document = getDocument(); IDocument document = getDocument();
if (document == null) return; if (document == null) return;
BuildConsolePartitioner partitioner = (BuildConsolePartitioner) document.getDocumentPartitioner(); BuildConsolePartitioner partitioner = (BuildConsolePartitioner) document.getDocumentPartitioner();
if (partitioner == null) return; if (partitioner == null) return;
BuildConsolePartition p = partitioner.fDocumentMarkerManager.getCurrentPartition(); BuildConsolePartition p = partitioner.fDocumentMarkerManager.getCurrentPartition();
Color problemHighlightedColor = partitioner.fManager.getProblemHighlightedColor(); Color problemHighlightedColor = partitioner.fManager.getProblemHighlightedColor();
// Note, computePartitioning actually doesn't change anything in partitioning, // Note, computePartitioning actually doesn't change anything in partitioning,
// but only computes number of affected regions. // but only computes number of affected regions.
ITypedRegion[] regions = partitioner.computePartitioning(event.lineOffset, event.lineText.length()); ITypedRegion[] regions = partitioner.computePartitioning(event.lineOffset, event.lineText.length());
StyleRange[] styles = new StyleRange[regions.length]; StyleRange[] styles = new StyleRange[regions.length];
for (int i = 0; i < regions.length; i++) { for (int i = 0; i < regions.length; i++) {
BuildConsolePartition partition = (BuildConsolePartition) regions[i]; BuildConsolePartition partition = (BuildConsolePartition) regions[i];
if (partition.getStream()== null) return;
Color colorFG = partition.getStream().getColor(); Color colorFG = partition.getStream().getColor();
Color colorBG = null; Color colorBG = null;
// Highlight current partition // Highlight current partition
if ( partition == p ) { if ( partition == p ) {
colorFG = problemHighlightedColor; colorFG = problemHighlightedColor;
} }
StyleRange styleRange = new StyleRange(partition.getOffset(), partition.getLength(), colorFG, colorBG); StyleRange styleRange = new StyleRange(partition.getOffset(), partition.getLength(), colorFG, colorBG);
styles[i] = styleRange; styles[i] = styleRange;
} }
event.styles = styles; event.styles = styles;
} }
public void selectPartition(BuildConsolePartitioner partitioner, BuildConsolePartition p) { public void selectPartition(BuildConsolePartitioner partitioner, BuildConsolePartition p) {
try { try {
int start = partitioner.getDocument().getLineOfOffset(p.getOffset()); int start = partitioner.getDocument().getLineOfOffset(p.getOffset());
int end = partitioner.getDocument().getLineOfOffset(p.getOffset()+p.getLength()-1); int end = partitioner.getDocument().getLineOfOffset(p.getOffset()+p.getLength()-1);
if ( fAutoScroll ) { if ( fAutoScroll ) {
// Check if area around this line is visible, scroll if needed // Check if area around this line is visible, scroll if needed
int top = getTopIndex(); int top = getTopIndex();
int bottom = getBottomIndex(); int bottom = getBottomIndex();
if ( start < top + 1 ) { if ( start < top + 1 ) {
setTopIndex(start - 1 > 0 ? start - 1 : 0); setTopIndex(start - 1 > 0 ? start - 1 : 0);
} else if ( end > bottom -1 ) { } else if ( end > bottom -1 ) {
setTopIndex(top + start - bottom + 1); setTopIndex(top + start - bottom + 1);
} }
} }
// Select line // Select line
StyledText st = getTextWidget(); StyledText st = getTextWidget();
st.redrawRange(0, partitioner.getDocument().getLength(), true); st.redrawRange(0, partitioner.getDocument().getLength(), true);
} catch (BadLocationException e) { } catch (BadLocationException e) {
CUIPlugin.log(e); CUIPlugin.log(e);
} }
} }
public void mouseEnter(MouseEvent e) { public void mouseEnter(MouseEvent e) {
getTextWidget().addMouseListener(this); getTextWidget().addMouseListener(this);
} }
public void mouseExit(MouseEvent e) { public void mouseExit(MouseEvent e) {
getTextWidget().removeMouseListener(this); getTextWidget().removeMouseListener(this);
} }
public void mouseHover(MouseEvent e) { public void mouseHover(MouseEvent e) {
} }
public void mouseDoubleClick(MouseEvent e) { public void mouseDoubleClick(MouseEvent e) {
int offset = -1; int offset = -1;
try { try {
Point p = new Point(e.x, e.y); Point p = new Point(e.x, e.y);
offset = getTextWidget().getOffsetAtLocation(p); offset = getTextWidget().getOffsetAtLocation(p);
BuildConsole.getPage().moveToError(offset); BuildConsole.getPage().moveToError(offset);
} catch (IllegalArgumentException ex) { } catch (IllegalArgumentException ex) {
} }
} }
public void mouseDown(MouseEvent e) { public void mouseDown(MouseEvent e) {
} }
public void mouseUp(MouseEvent e) { public void mouseUp(MouseEvent e) {
@ -250,10 +252,10 @@ public class BuildConsoleViewer extends TextViewer
public void lineGetBackground(LineBackgroundEvent event) { public void lineGetBackground(LineBackgroundEvent event) {
IDocument document = getDocument(); IDocument document = getDocument();
if (document == null) return; if (document == null) return;
BuildConsolePartitioner partitioner = (BuildConsolePartitioner) document.getDocumentPartitioner(); BuildConsolePartitioner partitioner = (BuildConsolePartitioner) document.getDocumentPartitioner();
if (partitioner == null) return; if (partitioner == null) return;
BuildConsolePartition partition = (BuildConsolePartition) partitioner.getPartition(event.lineOffset); BuildConsolePartition partition = (BuildConsolePartition) partitioner.getPartition(event.lineOffset);
// Set background for error partitions // Set background for error partitions
if ( partition != null && partition.getType() == BuildConsolePartition.ERROR_PARTITION_TYPE ) { if ( partition != null && partition.getType() == BuildConsolePartition.ERROR_PARTITION_TYPE ) {