LANG: Fix outline selection update bug.

GoClipse · May 28, 2015 · 204b368 · 204b368
1 parent 14f1529
commit 204b368
Showing 1 changed file with 11 additions and 2 deletions.
diff --git a/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/structure/LangOutlinePage.java b/plugin_ide.ui/src-lang/melnorme/lang/ide/ui/editor/structure/LangOutlinePage.java
@@ -86,17 +86,26 @@ protected void updateTreeViewer() {
 		updateSelectionFromEditor();
 	}
 
+	protected boolean updatingFromEditor = false;
+
 	protected void updateSelectionFromEditor() {
 		StructuredSelection newSelection = editor.getSelectedElementAsStructureSelection();
-		getTreeViewer().setSelection(newSelection, true);
+		try {
+			updatingFromEditor = true;
+			getTreeViewer().setSelection(newSelection, true);
+		} finally {
+			updatingFromEditor = false;
+		}
 	}
 
 	@Override
 	protected void treeViewerPostSelectionChanged(SelectionChangedEvent event) {
 		Object firstElement = ((IStructuredSelection) event.getSelection()).getFirstElement();
 		if(firstElement instanceof StructureElement) {
 			StructureElement structureElement = (StructureElement) firstElement;
-			editor.setElementSelection(structureElement);
+			if(!updatingFromEditor) {
+				editor.setElementSelection(structureElement);
+			}
 		}
 
 		super.treeViewerPostSelectionChanged(event);