X-Git-Url: http://secure.phpeclipse.com diff --git a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/link/LinkedPositionUI.java b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/link/LinkedPositionUI.java index a9389ea..bf483a5 100644 --- a/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/link/LinkedPositionUI.java +++ b/net.sourceforge.phpeclipse/src/net/sourceforge/phpdt/internal/ui/text/link/LinkedPositionUI.java @@ -1,28 +1,42 @@ -/* - * (c) Copyright IBM Corp. 2000, 2001. - * All Rights Reserved. - */ +/******************************************************************************* + * Copyright (c) 2000, 2003 IBM Corporation and others. + * All rights reserved. This program and the accompanying materials + * are made available under the terms of the Common Public License v1.0 + * which accompanies this distribution, and is available at + * http://www.eclipse.org/legal/cpl-v10.html + * + * Contributors: + * IBM Corporation - initial API and implementation + *******************************************************************************/ package net.sourceforge.phpdt.internal.ui.text.link; import java.lang.reflect.InvocationTargetException; +import net.sourceforge.phpdt.internal.ui.util.ExceptionHandler; +import net.sourceforge.phpdt.ui.PreferenceConstants; import net.sourceforge.phpeclipse.PHPeclipsePlugin; + import org.eclipse.core.runtime.CoreException; import org.eclipse.jface.dialogs.MessageDialog; import org.eclipse.jface.preference.IPreferenceStore; import org.eclipse.jface.preference.PreferenceConverter; +import org.eclipse.jface.text.Assert; import org.eclipse.jface.text.BadLocationException; import org.eclipse.jface.text.BadPositionCategoryException; import org.eclipse.jface.text.DefaultPositionUpdater; import org.eclipse.jface.text.IDocument; import org.eclipse.jface.text.IPositionUpdater; import org.eclipse.jface.text.IRegion; +import org.eclipse.jface.text.IRewriteTarget; import org.eclipse.jface.text.ITextInputListener; +import org.eclipse.jface.text.ITextListener; import org.eclipse.jface.text.ITextViewer; import org.eclipse.jface.text.ITextViewerExtension; +import org.eclipse.jface.text.ITextViewerExtension2; +import org.eclipse.jface.text.ITextViewerExtension3; import org.eclipse.jface.text.Position; import org.eclipse.jface.text.Region; -import org.eclipse.jface.util.Assert; +import org.eclipse.jface.text.TextEvent; import org.eclipse.jface.util.IPropertyChangeListener; import org.eclipse.jface.util.PropertyChangeEvent; import org.eclipse.swt.SWT; @@ -32,6 +46,8 @@ import org.eclipse.swt.events.ModifyEvent; import org.eclipse.swt.events.ModifyListener; import org.eclipse.swt.events.PaintEvent; import org.eclipse.swt.events.PaintListener; +import org.eclipse.swt.events.ShellEvent; +import org.eclipse.swt.events.ShellListener; import org.eclipse.swt.events.VerifyEvent; import org.eclipse.swt.events.VerifyListener; import org.eclipse.swt.graphics.Color; @@ -41,11 +57,13 @@ import org.eclipse.swt.graphics.RGB; import org.eclipse.swt.widgets.Display; import org.eclipse.swt.widgets.Shell; + + /** * A user interface for LinkedPositionManager, using ITextViewer. */ -public class LinkedPositionUI implements LinkedPositionListener, - ITextInputListener, ModifyListener, VerifyListener, VerifyKeyListener, PaintListener, IPropertyChangeListener { +public class LinkedPositionUI implements ILinkedPositionListener, + ITextInputListener, ITextListener, ModifyListener, VerifyListener, VerifyKeyListener, PaintListener, IPropertyChangeListener, ShellListener { /** * A listener for notification when the user cancelled the edit operation. @@ -54,29 +72,59 @@ public class LinkedPositionUI implements LinkedPositionListener, void exit(boolean accept); } - /** Preference key for linked position color */ - // public final static String LINKED_POSITION_COLOR= "_linkedPositionColor"; //$NON-NLS-1$ + public static class ExitFlags { + public int flags; + public boolean doit; + public ExitFlags(int flags, boolean doit) { + this.flags= flags; + this.doit= doit; + } + } + + public interface ExitPolicy { + ExitFlags doExit(LinkedPositionManager manager, VerifyEvent event, int offset, int length); + } + // leave flags private static final int UNINSTALL= 1; // uninstall linked position manager - private static final int COMMIT= 2; // commit changes + public static final int COMMIT= 2; // commit changes private static final int DOCUMENT_CHANGED= 4; // document has changed - private static final int UPDATE_CARET= 8; // update caret + public static final int UPDATE_CARET= 8; // update caret - private static final String CARET_POSITION= "LinkedPositionUI.caret.position"; //$NON-NLS-1$ - private static final IPositionUpdater fgUpdater= new DefaultPositionUpdater(CARET_POSITION); private static final IPreferenceStore fgStore= PHPeclipsePlugin.getDefault().getPreferenceStore(); + private static final String CARET_POSITION_PREFIX= "LinkedPositionUI.caret.position"; //$NON-NLS-1$ + private static int fgCounter= 0; + private final ITextViewer fViewer; - private final LinkedPositionManager fManager; + private final LinkedPositionManager fManager; + private final IPositionUpdater fUpdater; + private final String fPositionCategoryName; private Color fFrameColor; private int fFinalCaretOffset= -1; // no final caret offset + private Position fFinalCaretPosition; private Position fFramePosition; + private int fInitialOffset= -1; private int fCaretOffset; + private ExitPolicy fExitPolicy; private ExitListener fExitListener; + private boolean fNeedRedraw; + + private String fContentType; + private Position fPreviousPosition; +// private ContentAssistant2 fAssistant; + + /** + * Flag that records the state of this ui object. As there are many different entities that may + * call leave or exit, these cannot always be sure whether the linked position infrastructure is + * still active. This is especially true for multithreaded situations. + */ + private boolean fIsActive= false; + /** * Creates a user interface for LinkedPositionManager. * @@ -90,6 +138,9 @@ public class LinkedPositionUI implements LinkedPositionListener, fViewer= viewer; fManager= manager; + fPositionCategoryName= CARET_POSITION_PREFIX + (fgCounter++); + fUpdater= new DefaultPositionUpdater(fPositionCategoryName); + fManager.setLinkedPositionListener(this); initializeHighlightColor(viewer); @@ -99,8 +150,7 @@ public class LinkedPositionUI implements LinkedPositionListener, * @see IPropertyChangeListener#propertyChange(PropertyChangeEvent) */ public void propertyChange(PropertyChangeEvent event) { - // if (event.getProperty().equals(CompilationUnitEditor.LINKED_POSITION_COLOR)) { - if (event.getProperty().equals(PHPeclipsePlugin.LINKED_POSITION_COLOR)) { + if (event.getProperty().equals(PreferenceConstants.EDITOR_LINKED_POSITION_COLOR)) { initializeHighlightColor(fViewer); redrawRegion(); } @@ -114,9 +164,8 @@ public class LinkedPositionUI implements LinkedPositionListener, StyledText text= viewer.getTextWidget(); if (text != null) { Display display= text.getDisplay(); - // fFrameColor= createColor(fgStore, CompilationUnitEditor.LINKED_POSITION_COLOR, display); - fFrameColor= createColor(fgStore, PHPeclipsePlugin.LINKED_POSITION_COLOR, display); - } + fFrameColor= createColor(fgStore, PreferenceConstants.EDITOR_LINKED_POSITION_COLOR, display); + } } /** @@ -140,10 +189,20 @@ public class LinkedPositionUI implements LinkedPositionListener, return null; } + + /** + * Sets the initial offset. + * @param offset + */ + public void setInitialOffset(int offset) { + fInitialOffset= offset; + } /** * Sets the final position of the caret when the linked mode is exited * successfully by leaving the last linked position using TAB. + * The set position will be a TAB stop as well as the positions configured in the + * LinkedPositionManager. */ public void setFinalCaretOffset(int offset) { fFinalCaretOffset= offset; @@ -157,12 +216,23 @@ public class LinkedPositionUI implements LinkedPositionListener, fExitListener= listener; } + /** + * Sets an ExitPolicy which decides when and how + * the linked mode is exited. + */ + public void setExitPolicy(ExitPolicy policy) { + fExitPolicy= policy; + } + /* * @see LinkedPositionManager.LinkedPositionListener#setCurrentPositions(Position, int) */ public void setCurrentPosition(Position position, int caretOffset) { + if (!fIsActive) + ;//JavaPlugin.log(new Status(IStatus.WARNING, JavaPlugin.getPluginId(), IStatus.OK, "LinkedPositionUI is not active: "+fPositionCategoryName, new IllegalStateException())); //$NON-NLS-1$ + if (!fFramePosition.equals(position)) { - redrawRegion(); + fNeedRedraw= true; fFramePosition= position; } @@ -176,22 +246,34 @@ public class LinkedPositionUI implements LinkedPositionListener, * @see #exit(boolean) */ public void enter() { + if (fIsActive) + ;//JavaPlugin.log(new Status(IStatus.WARNING, JavaPlugin.getPluginId(), IStatus.OK, "LinkedPositionUI is already active: "+fPositionCategoryName, new IllegalStateException())); //$NON-NLS-1$ + else { + fIsActive= true; + // JavaPlugin.log(new Status(IStatus.INFO, JavaPlugin.getPluginId(), IStatus.OK, "LinkedPositionUI activated: "+fPositionCategoryName, new Exception())); //$NON-NLS-1$ + } + + // track final caret IDocument document= fViewer.getDocument(); - document.addPositionCategory(CARET_POSITION); - document.addPositionUpdater(fgUpdater); + document.addPositionCategory(fPositionCategoryName); + document.addPositionUpdater(fUpdater); + try { - if (fFinalCaretOffset != -1) - document.addPosition(CARET_POSITION, new Position(fFinalCaretOffset)); + if (fFinalCaretOffset != -1) { + fFinalCaretPosition= new Position(fFinalCaretOffset); + document.addPosition(fPositionCategoryName, fFinalCaretPosition); + } } catch (BadLocationException e) { handleException(fViewer.getTextWidget().getShell(), e); } catch (BadPositionCategoryException e) { - PHPeclipsePlugin.log(e); + PHPeclipsePlugin.log(e); Assert.isTrue(false); } fViewer.addTextInputListener(this); + fViewer.addTextListener(this); ITextViewerExtension extension= (ITextViewerExtension) fViewer; extension.prependVerifyKeyListener(this); @@ -202,19 +284,48 @@ public class LinkedPositionUI implements LinkedPositionListener, text.addPaintListener(this); text.showSelection(); - fFramePosition= fManager.getFirstPosition(); - if (fFramePosition == null) + Shell shell= text.getShell(); + shell.addShellListener(this); + + fFramePosition= (fInitialOffset == -1) ? fManager.getFirstPosition() : fManager.getPosition(fInitialOffset); + if (fFramePosition == null) { leave(UNINSTALL | COMMIT | UPDATE_CARET); + return; + } fgStore.addPropertyChangeListener(this); + +// try { +// fContentType= TextUtilities.getContentType(document, IJavaPartitions.JAVA_PARTITIONING, fFramePosition.offset); +// if (fViewer instanceof ITextViewerExtension2) { +// ((ITextViewerExtension2) fViewer).prependAutoEditStrategy(fManager, fContentType); +// } else { +// Assert.isTrue(false); +// } +// +// } catch (BadLocationException e) { +// handleException(fViewer.getTextWidget().getShell(), e); +// } + try { + fContentType= document.getContentType(fFramePosition.offset); + if (fViewer instanceof ITextViewerExtension2) { + ((ITextViewerExtension2) fViewer).prependAutoEditStrategy(fManager, fContentType); + } else { + Assert.isTrue(false); + } + + } catch (BadLocationException e) { + handleException(fViewer.getTextWidget().getShell(), e); + } + selectRegion(); +// triggerContentAssist(); } /* - * @see LinkedPositionManager.LinkedPositionListener#exit(boolean) + * @see net.sourceforge.phpdt.internal.ui.text.link.ILinkedPositionListener#exit(boolean) */ - public void exit(boolean success) { - // no UNINSTALL since manager has already uninstalled itself - leave((success ? COMMIT : 0) | UPDATE_CARET); + public void exit(int flags) { + leave(flags); } /** @@ -222,6 +333,9 @@ public class LinkedPositionUI implements LinkedPositionListener, * enter() must be called prior to a call to this method. */ public IRegion getSelectedRegion() { + if (!fIsActive) + ;//JavaPlugin.log(new Status(IStatus.WARNING, JavaPlugin.getPluginId(), IStatus.OK, "LinkedPositionUI is not active: "+fPositionCategoryName, new IllegalStateException())); //$NON-NLS-1$ + if (fFramePosition == null) return new Region(fFinalCaretOffset, 0); else @@ -229,6 +343,16 @@ public class LinkedPositionUI implements LinkedPositionListener, } private void leave(int flags) { + if (!fIsActive) + ;//JavaPlugin.log(new Status(IStatus.WARNING, JavaPlugin.getPluginId(), IStatus.OK, "LinkedPositionUI is not active: "+fPositionCategoryName, new IllegalStateException())); //$NON-NLS-1$ + else { + fIsActive= false; + //JavaPlugin.log(new Status(IStatus.INFO, JavaPlugin.getPluginId(), IStatus.OK, "LinkedPositionUI deactivated: "+fPositionCategoryName, new Exception())); //$NON-NLS-1$ + } + + + fInitialOffset= -1; + if ((flags & UNINSTALL) != 0) fManager.uninstall((flags & COMMIT) != 0); @@ -239,35 +363,73 @@ public class LinkedPositionUI implements LinkedPositionListener, fFrameColor= null; } - StyledText text= fViewer.getTextWidget(); + StyledText text= fViewer.getTextWidget(); + // bail out if the styled text is null, meaning the viewer has been disposed (-> document is null as well) + // see pr https://bugs.eclipse.org/bugs/show_bug.cgi?id=46821 + if (text == null) + return; + text.removePaintListener(this); text.removeModifyListener(this); text.removeVerifyListener(this); + Shell shell= text.getShell(); + shell.removeShellListener(this); + +// if (fAssistant != null) { +// Display display= text.getDisplay(); +// if (display != null && !display.isDisposed()) { +// display.asyncExec(new Runnable() { +// public void run() { +// if (fAssistant != null) { +// fAssistant.uninstall(); +// fAssistant= null; +// } +// } +// }); +// } +// } + ITextViewerExtension extension= (ITextViewerExtension) fViewer; extension.removeVerifyKeyListener(this); + + IRewriteTarget target= extension.getRewriteTarget(); + target.endCompoundChange(); + + if (fViewer instanceof ITextViewerExtension2 && fContentType != null) + ((ITextViewerExtension2) fViewer).removeAutoEditStrategy(fManager, fContentType); + fContentType= null; + fViewer.removeTextListener(this); fViewer.removeTextInputListener(this); try { - IRegion region= fViewer.getVisibleRegion(); IDocument document= fViewer.getDocument(); if (((flags & COMMIT) != 0) && ((flags & DOCUMENT_CHANGED) == 0) && ((flags & UPDATE_CARET) != 0)) { - Position[] positions= document.getPositions(CARET_POSITION); - + Position[] positions= document.getPositions(fPositionCategoryName); if ((positions != null) && (positions.length != 0)) { - int offset= positions[0].getOffset() - region.getOffset(); - if ((offset >= 0) && (offset <= region.getLength())) - text.setSelection(offset, offset); + + if (fViewer instanceof ITextViewerExtension3) { + ITextViewerExtension3 extension3= (ITextViewerExtension3) fViewer; + int widgetOffset= extension3.modelOffset2WidgetOffset(positions[0].getOffset()); + if (widgetOffset >= 0) + text.setSelection(widgetOffset, widgetOffset); + + } else { + IRegion region= fViewer.getVisibleRegion(); + int offset= positions[0].getOffset() - region.getOffset(); + if ((offset >= 0) && (offset <= region.getLength())) + text.setSelection(offset, offset); + } } } - document.removePositionUpdater(fgUpdater); - document.removePositionCategory(CARET_POSITION); + document.removePositionUpdater(fUpdater); + document.removePositionCategory(fPositionCategoryName); if (fExitListener != null) fExitListener.exit( @@ -284,46 +446,103 @@ public class LinkedPositionUI implements LinkedPositionListener, } private void next() { + if (!fIsActive) + ;//JavaPlugin.log(new Status(IStatus.WARNING, JavaPlugin.getPluginId(), IStatus.OK, "LinkedPositionUI is not active: "+fPositionCategoryName, new IllegalStateException())); //$NON-NLS-1$ + redrawRegion(); - fFramePosition= fManager.getNextPosition(fFramePosition.getOffset()); + if (fFramePosition == fFinalCaretPosition) + fFramePosition= fManager.getFirstPosition(); + else + fFramePosition= fManager.getNextPosition(fFramePosition.getOffset()); + if (fFramePosition == null) { + if (fFinalCaretPosition != null) + fFramePosition= fFinalCaretPosition; + else + fFramePosition= fManager.getFirstPosition(); + } if (fFramePosition == null) { leave(UNINSTALL | COMMIT | UPDATE_CARET); } else { selectRegion(); +// triggerContentAssist(); redrawRegion(); } } private void previous() { + if (!fIsActive) + ;//JavaPlugin.log(new Status(IStatus.WARNING, JavaPlugin.getPluginId(), IStatus.OK, "LinkedPositionUI is not active: "+fPositionCategoryName, new IllegalStateException())); //$NON-NLS-1$ + redrawRegion(); - Position position= fManager.getPreviousPosition(fFramePosition.getOffset()); - if (position == null) { - fViewer.getTextWidget().getDisplay().beep(); + fFramePosition= fManager.getPreviousPosition(fFramePosition.getOffset()); + if (fFramePosition == null) { + if (fFinalCaretPosition != null) + fFramePosition= fFinalCaretPosition; + else + fFramePosition= fManager.getLastPosition(); + } + if (fFramePosition == null) { + leave(UNINSTALL | COMMIT | UPDATE_CARET); } else { - fFramePosition= position; selectRegion(); +// triggerContentAssist(); redrawRegion(); - } + } } + /** Trigger content assist on choice positions */ +// private void triggerContentAssist() { +// if (fFramePosition instanceof ProposalPosition) { +// +// ProposalPosition pp= (ProposalPosition) fFramePosition; +// initializeContentAssistant(); +// if (fAssistant == null) +// return; +// fAssistant.setCompletions(pp.getChoices()); +// fAssistant.showPossibleCompletions(); +// } else { +// if (fAssistant != null) +// fAssistant.setCompletions(new ICompletionProposal[0]); +// } +// } + + /** Lazy initialize content assistant for this linked ui */ +// private void initializeContentAssistant() { +// if (fAssistant != null) +// return; +// fAssistant= new ContentAssistant2(); +// fAssistant.setDocumentPartitioning(IJavaPartitions.JAVA_PARTITIONING); +// fAssistant.install(fViewer); +// } + /* * @see VerifyKeyListener#verifyKey(VerifyEvent) */ public void verifyKey(VerifyEvent event) { + + if (!event.doit || !fIsActive) + return; + + Point selection= fViewer.getSelectedRange(); + int offset= selection.x; + int length= selection.y; + + ExitFlags exitFlags= fExitPolicy == null ? null : fExitPolicy.doExit(fManager, event, offset, length); + if (exitFlags != null) { + leave(UNINSTALL | exitFlags.flags); + event.doit= exitFlags.doit; + return; + } + switch (event.character) { // [SHIFT-]TAB = hop between edit boxes case 0x09: { - Point selection= fViewer.getTextWidget().getSelection(); - IRegion region= fViewer.getVisibleRegion(); - int offset= selection.x + region.getOffset(); - int length= selection.y - selection.x; - // if tab was treated as a document change, would it exceed variable range? if (!LinkedPositionManager.includes(fFramePosition, offset, length)) { - leave(UNINSTALL | COMMIT | UPDATE_CARET); + leave(UNINSTALL | COMMIT); return; } } @@ -337,7 +556,23 @@ public class LinkedPositionUI implements LinkedPositionListener, break; // ENTER + case 0x0A: // Ctrl+Enter case 0x0D: + { +// if (fAssistant != null && fAssistant.wasProposalChosen()) { +// next(); +// event.doit= false; +// break; +// } + + // if enter was treated as a document change, would it exceed variable range? + if (!LinkedPositionManager.includes(fFramePosition, offset, length) + || (fFramePosition == fFinalCaretPosition)) { + leave(UNINSTALL | COMMIT); + return; + } + } + leave(UNINSTALL | COMMIT | UPDATE_CARET); event.doit= false; break; @@ -347,21 +582,65 @@ public class LinkedPositionUI implements LinkedPositionListener, leave(UNINSTALL | COMMIT); event.doit= false; break; + + case ';': + leave(UNINSTALL | COMMIT); + event.doit= true; + break; + + default: + if (event.character != 0) { + if (!controlUndoBehavior(offset, length) || fFramePosition == fFinalCaretPosition) { + leave(UNINSTALL | COMMIT); + break; + } + } } } - + + private boolean controlUndoBehavior(int offset, int length) { + + Position position= fManager.getEmbracingPosition(offset, length); + if (position != null) { + + ITextViewerExtension extension= (ITextViewerExtension) fViewer; + IRewriteTarget target= extension.getRewriteTarget(); + + if (fPreviousPosition != null && !fPreviousPosition.equals(position)) + target.endCompoundChange(); + target.beginCompoundChange(); + } + + fPreviousPosition= position; + return fPreviousPosition != null; + } + /* * @see VerifyListener#verifyText(VerifyEvent) */ public void verifyText(VerifyEvent event) { if (!event.doit) return; - - IRegion region= fViewer.getVisibleRegion(); - - int offset= event.start + region.getOffset(); - int length= event.end - event.start; - + + + int offset= 0; + int length= 0; + + if (fViewer instanceof ITextViewerExtension3) { + ITextViewerExtension3 extension= (ITextViewerExtension3) fViewer; + IRegion modelRange= extension.widgetRange2ModelRange(new Region(event.start, event.end - event.start)); + if (modelRange == null) + return; + + offset= modelRange.getOffset(); + length= modelRange.getLength(); + + } else { + IRegion visibleRegion= fViewer.getVisibleRegion(); + offset= event.start + visibleRegion.getOffset(); + length= event.end - event.start; + } + // allow changes only within linked positions when coming through UI if (!fManager.anyPositionIncludes(offset, length)) leave(UNINSTALL | COMMIT); @@ -373,18 +652,16 @@ public class LinkedPositionUI implements LinkedPositionListener, public void paintControl(PaintEvent event) { if (fFramePosition == null) return; - - IRegion region= fViewer.getVisibleRegion(); - - // #6824 - if (!includes(region, fFramePosition)) { - leave(UNINSTALL | COMMIT | DOCUMENT_CHANGED); - return; - } - - int offset= fFramePosition.getOffset() - region.getOffset(); - int length= fFramePosition.getLength(); + IRegion widgetRange= asWidgetRange(fFramePosition); + if (widgetRange == null) { + leave(UNINSTALL | COMMIT | DOCUMENT_CHANGED); + return; + } + + int offset= widgetRange.getOffset(); + int length= widgetRange.getLength(); + StyledText text= fViewer.getTextWidget(); // support for bidi @@ -399,6 +676,22 @@ public class LinkedPositionUI implements LinkedPositionListener, gc.setForeground(fFrameColor); gc.drawLine(x1, y, x2, y); } + + protected IRegion asWidgetRange(Position position) { + if (fViewer instanceof ITextViewerExtension3) { + + ITextViewerExtension3 extension= (ITextViewerExtension3) fViewer; + return extension.modelRange2WidgetRange(new Region(position.getOffset(), position.getLength())); + + } else { + + IRegion region= fViewer.getVisibleRegion(); + if (includes(region, position)) + return new Region(position.getOffset() - region.getOffset(), position.getLength()); + } + + return null; + } private static Point getMinimumLocation(StyledText text, int offset, int length) { Point minLocation= new Point(Integer.MAX_VALUE, Integer.MAX_VALUE); @@ -431,52 +724,45 @@ public class LinkedPositionUI implements LinkedPositionListener, } private void redrawRegion() { - IRegion region= fViewer.getVisibleRegion(); - - if (!includes(region, fFramePosition)) { + IRegion widgetRange= asWidgetRange(fFramePosition); + if (widgetRange == null) { leave(UNINSTALL | COMMIT | DOCUMENT_CHANGED); return; } - - int offset= fFramePosition.getOffset() - region.getOffset(); - int length= fFramePosition.getLength(); - + StyledText text= fViewer.getTextWidget(); - if (text != null && !text.isDisposed()) - text.redrawRange(offset, length, true); + if (text != null && !text.isDisposed()) + text.redrawRange(widgetRange.getOffset(), widgetRange.getLength(), true); } private void selectRegion() { - IRegion region= fViewer.getVisibleRegion(); - - if (!includes(region, fFramePosition)) { + + IRegion widgetRange= asWidgetRange(fFramePosition); + if (widgetRange == null) { leave(UNINSTALL | COMMIT | DOCUMENT_CHANGED); return; } - int start= fFramePosition.getOffset() - region.getOffset(); - int end= fFramePosition.getLength() + start; - StyledText text= fViewer.getTextWidget(); - if (text != null && !text.isDisposed()) + if (text != null && !text.isDisposed()) { + int start= widgetRange.getOffset(); + int end= widgetRange.getLength() + start; text.setSelection(start, end); + } } - + private void updateCaret() { - IRegion region= fViewer.getVisibleRegion(); - - if (!includes(region, fFramePosition)) { + + IRegion widgetRange= asWidgetRange(fFramePosition); + if (widgetRange == null) { leave(UNINSTALL | COMMIT | DOCUMENT_CHANGED); return; } - - int offset= fFramePosition.getOffset() + fCaretOffset - region.getOffset(); - if ((offset >= 0) && (offset <= region.getLength())) { - StyledText text= fViewer.getTextWidget(); - if (text != null && !text.isDisposed()) - text.setCaretOffset(offset); - } + int offset= widgetRange.getOffset() + fCaretOffset; + StyledText text= fViewer.getTextWidget(); + if (text != null && !text.isDisposed()) + text.setCaretOffset(offset); } /* @@ -491,11 +777,9 @@ public class LinkedPositionUI implements LinkedPositionListener, private static void handleException(Shell shell, Exception e) { String title= LinkedPositionMessages.getString("LinkedPositionUI.error.title"); //$NON-NLS-1$ if (e instanceof CoreException) - PHPeclipsePlugin.log(e); - // ExceptionHandler.handle((CoreException)e, shell, title, null); + ExceptionHandler.handle((CoreException)e, shell, title, null); else if (e instanceof InvocationTargetException) - PHPeclipsePlugin.log(e); - // ExceptionHandler.handle((InvocationTargetException)e, shell, title, null); + ExceptionHandler.handle((InvocationTargetException)e, shell, title, null); else { MessageDialog.openError(shell, title, e.getMessage()); PHPeclipsePlugin.log(e); @@ -523,4 +807,83 @@ public class LinkedPositionUI implements LinkedPositionListener, position.getOffset() + position.getLength() <= region.getOffset() + region.getLength(); } -} \ No newline at end of file + /* + * @see org.eclipse.jface.text.ITextListener#textChanged(TextEvent) + */ + public void textChanged(TextEvent event) { + if (!fNeedRedraw) + return; + + redrawRegion(); + fNeedRedraw= false; + } + + /* + * @see org.eclipse.swt.events.ShellListener#shellActivated(org.eclipse.swt.events.ShellEvent) + */ + public void shellActivated(ShellEvent event) { + } + + /* + * @see org.eclipse.swt.events.ShellListener#shellClosed(org.eclipse.swt.events.ShellEvent) + */ + public void shellClosed(ShellEvent event) { + leave(UNINSTALL | COMMIT | DOCUMENT_CHANGED); + } + + /* + * @see org.eclipse.swt.events.ShellListener#shellDeactivated(org.eclipse.swt.events.ShellEvent) + */ + public void shellDeactivated(ShellEvent event) { + // don't deactivate on focus lost, since the proposal popups may take focus + // plus: it doesn't hurt if you can check with another window without losing linked mode + // since there is no intrusive popup sticking out. + + // need to check first what happens on reentering based on an open action + // Seems to be no problem + + // TODO check whether we can leave it or uncomment it after debugging + // PS: why DOCUMENT_CHANGED? We want to trigger a redraw! (Shell deactivated does not mean + // it is not visible any longer. +// leave(UNINSTALL | COMMIT | DOCUMENT_CHANGED); + + // Better: + // Check with content assistant and only leave if its not the proposal shell that took the + // focus away. + + StyledText text; + Display display; + +// if (fAssistant == null || fViewer == null || (text= fViewer.getTextWidget()) == null +// || (display= text.getDisplay()) == null || display.isDisposed()) { + if ( fViewer == null || (text= fViewer.getTextWidget()) == null + || (display= text.getDisplay()) == null || display.isDisposed()) { + leave(UNINSTALL | COMMIT); + } else { + // Post in UI thread since the assistant popup will only get the focus after we lose it. + display.asyncExec(new Runnable() { + public void run() { + // TODO add isDisposed / isUninstalled / hasLeft check? for now: check for content type, + // since it gets nullified in leave() + if (fIsActive) {// && (fAssistant == null || !fAssistant.hasFocus())) { + leave(UNINSTALL | COMMIT); + } + } + }); + } + } + + /* + * @see org.eclipse.swt.events.ShellListener#shellDeiconified(org.eclipse.swt.events.ShellEvent) + */ + public void shellDeiconified(ShellEvent event) { + } + + /* + * @see org.eclipse.swt.events.ShellListener#shellIconified(org.eclipse.swt.events.ShellEvent) + */ + public void shellIconified(ShellEvent event) { + leave(UNINSTALL | COMMIT | DOCUMENT_CHANGED); + } + +}