mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-23 14:42:11 +02:00
Code Issues Wiki Activity

Fix for 185095: NullPointerException while editing C/C++ source

Browse source
This commit is contained in:
Anton Leherbauer 2007-05-03 07:52:19 +00:00
parent 0bec8cba77
commit f2655d2516
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/editor/InactiveCodeHighlighting.java
View file

@ -26,6 +26,7 @@ import org.eclipse.jface.text.BadLocationException;
import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IDocument;
import org.eclipse.jface.text.IRegion; import org.eclipse.jface.text.IRegion;
import org.eclipse.jface.text.ITextInputListener; import org.eclipse.jface.text.ITextInputListener;
import org.eclipse.jface.text.Region;
import org.eclipse.jface.text.TypedPosition; import org.eclipse.jface.text.TypedPosition;
import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Display;
@ -194,13 +195,7 @@ public class InactiveCodeHighlighting implements ICReconcilingListener, ITextInp
if (progressMonitor != null && progressMonitor.isCanceled()) { if (progressMonitor != null && progressMonitor.isCanceled()) {
return; return;
} }
final List newInactiveCodePositions = collectInactiveCodePositions(ast); final List newInactiveCodePositions= collectInactiveCodePositions(ast, positionTracker);
if (positionTracker != null) {
for (int i = 0, sz = newInactiveCodePositions.size(); i < sz; i++) {
IRegion pos = (IRegion) newInactiveCodePositions.get(i);
newInactiveCodePositions.set(i, new HighlightPosition(positionTracker.historicToActual(pos), fHighlightKey));
}
}
Runnable updater = new Runnable() { Runnable updater = new Runnable() {
public void run() { public void run() {
if (fEditor != null && fLineBackgroundPainter != null && !fLineBackgroundPainter.isDisposed()) { if (fEditor != null && fLineBackgroundPainter != null && !fLineBackgroundPainter.isDisposed()) {
@ -219,9 +214,10 @@ public class InactiveCodeHighlighting implements ICReconcilingListener, ITextInp
* in the given translation unit. * in the given translation unit.
* *
* @param translationUnit the {@link IASTTranslationUnit}, may be <code>null</code> * @param translationUnit the {@link IASTTranslationUnit}, may be <code>null</code>
* @param positionTracker map historic positions to actual
* @return a {@link List} of {@link IRegion}s * @return a {@link List} of {@link IRegion}s
*/ */
private List collectInactiveCodePositions(IASTTranslationUnit translationUnit) { private List collectInactiveCodePositions(IASTTranslationUnit translationUnit, IPositionConverter positionTracker) {
if (translationUnit == null) { if (translationUnit == null) {
return Collections.EMPTY_LIST; return Collections.EMPTY_LIST;
} }
@ -281,7 +277,7 @@ public class InactiveCodeHighlighting implements ICReconcilingListener, ITextInp
inInactiveCode = true; inInactiveCode = true;
} else if (elseStmt.taken() && inInactiveCode) { } else if (elseStmt.taken() && inInactiveCode) {
int inactiveCodeEnd = stmtLocation.getNodeOffset(); int inactiveCodeEnd = stmtLocation.getNodeOffset();
positions.add(createHighlightPosition(inactiveCodeStart, inactiveCodeEnd, false, fHighlightKey)); positions.add(createHighlightPosition(inactiveCodeStart, inactiveCodeEnd, positionTracker, false, fHighlightKey));
inInactiveCode = false; inInactiveCode = false;
} }
} else if (statement instanceof IASTPreprocessorElifStatement) { } else if (statement instanceof IASTPreprocessorElifStatement) {
@ -291,7 +287,7 @@ public class InactiveCodeHighlighting implements ICReconcilingListener, ITextInp
inInactiveCode = true; inInactiveCode = true;
} else if (elifStmt.taken() && inInactiveCode) { } else if (elifStmt.taken() && inInactiveCode) {
int inactiveCodeEnd = stmtLocation.getNodeOffset(); int inactiveCodeEnd = stmtLocation.getNodeOffset();
positions.add(createHighlightPosition(inactiveCodeStart, inactiveCodeEnd, false, fHighlightKey)); positions.add(createHighlightPosition(inactiveCodeStart, inactiveCodeEnd, positionTracker, false, fHighlightKey));
inInactiveCode = false; inInactiveCode = false;
} }
} else if (statement instanceof IASTPreprocessorEndifStatement) { } else if (statement instanceof IASTPreprocessorEndifStatement) {
@ -299,7 +295,7 @@ public class InactiveCodeHighlighting implements ICReconcilingListener, ITextInp
boolean wasInInactiveCode = ((Boolean)inactiveCodeStack.pop()).booleanValue(); boolean wasInInactiveCode = ((Boolean)inactiveCodeStack.pop()).booleanValue();
if (inInactiveCode && !wasInInactiveCode) { if (inInactiveCode && !wasInInactiveCode) {
int inactiveCodeEnd = stmtLocation.getNodeOffset() + stmtLocation.getNodeLength(); int inactiveCodeEnd = stmtLocation.getNodeOffset() + stmtLocation.getNodeLength();
positions.add(createHighlightPosition(inactiveCodeStart, inactiveCodeEnd, true, fHighlightKey)); positions.add(createHighlightPosition(inactiveCodeStart, inactiveCodeEnd, positionTracker, true, fHighlightKey));
} }
inInactiveCode = wasInInactiveCode; inInactiveCode = wasInInactiveCode;
} }
@ -319,11 +315,17 @@ public class InactiveCodeHighlighting implements ICReconcilingListener, ITextInp
* *
* @param startOffset the start offset of the region to align * @param startOffset the start offset of the region to align
* @param endOffset the (exclusive) end offset of the region to align * @param endOffset the (exclusive) end offset of the region to align
* @param positionTracker map historic position to actual
* @param inclusive whether the last line should be included or not * @param inclusive whether the last line should be included or not
* @param key the highlight key * @param key the highlight key
* @return a position aligned for background highlighting * @return a position aligned for background highlighting
*/ */
private HighlightPosition createHighlightPosition(int startOffset, int endOffset, boolean inclusive, String key) { private HighlightPosition createHighlightPosition(int startOffset, int endOffset, IPositionConverter positionTracker, boolean inclusive, String key) {
if (positionTracker != null) {
IRegion original= positionTracker.historicToActual(new Region(startOffset, endOffset - startOffset));
startOffset= original.getOffset();
endOffset= startOffset + original.getLength();
}
final IDocument document= fDocument; final IDocument document= fDocument;
try { try {
if (document != null) { if (document != null) {
@ -334,12 +336,10 @@ public class InactiveCodeHighlighting implements ICReconcilingListener, ITextInp
endOffset= document.getLineOffset(end); endOffset= document.getLineOffset(end);
} }
} }
return new HighlightPosition(startOffset, endOffset - startOffset, key);
} catch (BadLocationException x) { } catch (BadLocationException x) {
// concurrent modification? // concurrent modification?
return null;
} }
return new HighlightPosition(startOffset, endOffset - startOffset, key);
} }
/* /*