mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-08-01 21:35:40 +02:00
Code Issues Wiki Activity

Fix for 190860: functions are folded when navigating to an unopened file

Browse source
This commit is contained in:
Anton Leherbauer 2007-07-06 09:29:31 +00:00
parent 8d2d72b9b8
commit d4c724562d
1 changed files with 32 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/folding/DefaultCFoldingStructureProvider.java
View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (c) 2000, 2007 QNX Software Systems and others. * Copyright (c) 2000, 2007 IBM Corporation and others.
* All rights reserved. This program and the accompanying materials * All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0 * are made available under the terms of the Eclipse Public License v1.0
* which accompanies this distribution, and is available at * which accompanies this distribution, and is available at
@ -33,6 +33,7 @@ import org.eclipse.jface.preference.IPreferenceStore;
import org.eclipse.jface.text.BadLocationException; 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.ITextSelection;
import org.eclipse.jface.text.ITypedRegion; import org.eclipse.jface.text.ITypedRegion;
import org.eclipse.jface.text.Position; import org.eclipse.jface.text.Position;
import org.eclipse.jface.text.Region; import org.eclipse.jface.text.Region;
@ -43,6 +44,8 @@ import org.eclipse.jface.text.source.projection.IProjectionPosition;
import org.eclipse.jface.text.source.projection.ProjectionAnnotation; import org.eclipse.jface.text.source.projection.ProjectionAnnotation;
import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel; import org.eclipse.jface.text.source.projection.ProjectionAnnotationModel;
import org.eclipse.jface.text.source.projection.ProjectionViewer; import org.eclipse.jface.text.source.projection.ProjectionViewer;
import org.eclipse.jface.viewers.ISelectionChangedListener;
import org.eclipse.jface.viewers.SelectionChangedEvent;
import org.eclipse.ui.texteditor.IDocumentProvider; import org.eclipse.ui.texteditor.IDocumentProvider;
import org.eclipse.ui.texteditor.ITextEditor; import org.eclipse.ui.texteditor.ITextEditor;
@ -85,6 +88,16 @@ import org.eclipse.cdt.internal.ui.text.ICReconcilingListener;
*/ */
public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvider { public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvider {
/**
* Listen to cursor position changes.
*/
private final class SelectionListener implements ISelectionChangedListener {
public void selectionChanged(SelectionChangedEvent event) {
ITextSelection selection= (ITextSelection)event.getSelection();
fCursorPosition= selection.getOffset();
}
}
/** /**
* Reconcile annotation positions from preprocessor branches. * Reconcile annotation positions from preprocessor branches.
*/ */
@ -659,6 +672,10 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi
private ICReconcilingListener fReconilingListener; private ICReconcilingListener fReconilingListener;
boolean fInitialReconcilePending= true; boolean fInitialReconcilePending= true;
private int fCursorPosition;
private SelectionListener fSelectionListener;
/** /**
* Creates a new folding provider. It must be * Creates a new folding provider. It must be
@ -725,7 +742,6 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi
*/ */
protected void handleProjectionEnabled() { protected void handleProjectionEnabled() {
if (DEBUG) System.out.println("DefaultCFoldingStructureProvider.handleProjectionEnabled()"); //$NON-NLS-1$ if (DEBUG) System.out.println("DefaultCFoldingStructureProvider.handleProjectionEnabled()"); //$NON-NLS-1$
// http://home.ott.oti.com/teams/wswb/anon/out/vms/index.html
// projectionEnabled messages are not always paired with projectionDisabled // projectionEnabled messages are not always paired with projectionDisabled
// i.e. multiple enabled messages may be sent out. // i.e. multiple enabled messages may be sent out.
// we have to make sure that we disable first when getting an enable // we have to make sure that we disable first when getting an enable
@ -737,6 +753,8 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi
initialize(); initialize();
fReconilingListener= new PreprocessorBranchesReconciler(); fReconilingListener= new PreprocessorBranchesReconciler();
((CEditor)fEditor).addReconcileListener(fReconilingListener); ((CEditor)fEditor).addReconcileListener(fReconilingListener);
fSelectionListener= new SelectionListener();
fEditor.getSelectionProvider().addSelectionChangedListener(fSelectionListener);
} }
} }
@ -759,6 +777,10 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi
((CEditor)fEditor).removeReconcileListener(fReconilingListener); ((CEditor)fEditor).removeReconcileListener(fReconilingListener);
fReconilingListener= null; fReconilingListener= null;
} }
if (fSelectionListener != null) {
fEditor.getSelectionProvider().removeSelectionChangedListener(fSelectionListener);
fSelectionListener= null;
}
} }
/* /*
@ -815,6 +837,11 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi
if (ctx == null) if (ctx == null)
return; return;
if (!fInitialReconcilePending && fSelectionListener != null) {
fEditor.getSelectionProvider().removeSelectionChangedListener(fSelectionListener);
fSelectionListener= null;
}
Map additions= new HashMap(); Map additions= new HashMap();
List deletions= new ArrayList(); List deletions= new ArrayList();
List updates= new ArrayList(); List updates= new ArrayList();
@ -1328,8 +1355,10 @@ public class DefaultCFoldingStructureProvider implements ICFoldingStructureProvi
IRegion normalized= alignRegion(regions[regions.length - 1], ctx, true); IRegion normalized= alignRegion(regions[regions.length - 1], ctx, true);
if (normalized != null) { if (normalized != null) {
Position position= element instanceof IMember ? createMemberPosition(normalized, (IMember) element) : createCommentPosition(normalized); Position position= element instanceof IMember ? createMemberPosition(normalized, (IMember) element) : createCommentPosition(normalized);
if (position != null) if (position != null) {
collapse= collapse && !position.includes(fCursorPosition);
ctx.addProjectionRange(new CProjectionAnnotation(collapse, element, false), position); ctx.addProjectionRange(new CProjectionAnnotation(collapse, element, false), position);
}
} }
} }
} }