@lang: correct use of CancellationException

plugin_ide.core/src/com/googlecode/goclipse/core/operations/GetAndInstallGoPackageOperation.java

@@ -12,6 +12,7 @@
 
 import melnorme.lang.ide.core.utils.CoreOperationAdapter;
 import melnorme.utilbox.collections.ArrayList2;
+import melnorme.utilbox.concurrency.OperationCancellation;
 import melnorme.utilbox.core.CommonException;
 import melnorme.utilbox.misc.CollectionUtil;
 import melnorme.utilbox.misc.Location;
@@ -38,7 +39,7 @@ public GetAndInstallGoPackageOperation(String goPackage, String exeName) {
 	protected Location workingDir;
 
 	@Override
-	public void doRun(IProgressMonitor monitor) throws CommonException, CoreException {
+	public void doRun(IProgressMonitor monitor) throws CommonException, CoreException, OperationCancellation {
 		GoEnvironment goEnv = GoProjectEnvironment.getGoEnvironment(null);
 		workingDir = getFirstGoPathEntry(goEnv);
 

plugin_ide.core/src/com/googlecode/goclipse/core/operations/GoBuilder.java

@@ -19,9 +19,11 @@
 import melnorme.lang.ide.core.operations.LangProjectBuilder;
 import melnorme.lang.ide.core.operations.LangProjectBuilderExt;
 import melnorme.lang.ide.core.operations.SDKLocationValidator;
+import melnorme.lang.ide.core.utils.EclipseUtils;
 import melnorme.lang.tooling.data.LocationValidator;
 import melnorme.lang.tooling.data.StatusException;
 import melnorme.utilbox.collections.ArrayList2;
+import melnorme.utilbox.concurrency.OperationCancellation;
 import melnorme.utilbox.core.CommonException;
 import melnorme.utilbox.misc.Location;
 import melnorme.utilbox.process.ExternalProcessHelper.ExternalProcessResult;
@@ -90,7 +92,7 @@ protected void handleLastOfKind() {
 
 	@Override
 	protected IProject[] doBuild(final IProject project, int kind, Map<String, String> args, IProgressMonitor monitor)
-			throws CoreException {
+			throws CoreException, OperationCancellation {
 
 		GoToolManager.getDefault().notifyBuildStarting(project, false);
 
@@ -154,6 +156,15 @@ protected void addSourcePackagesToCmdLine(final IProject project, ArrayList2<Str
 
 	@Override
 	protected void clean(IProgressMonitor monitor) throws CoreException {
+		try {
+			EclipseUtils.checkMonitorCancelation(monitor);
+			doClean(monitor);
+		} catch (OperationCancellation e) {
+			// return
+		}
+	}
+
+	protected void doClean(IProgressMonitor monitor) throws CoreException, OperationCancellation {
 		deleteProjectBuildMarkers();
 
 		IProject project = getProject();

plugin_ide.core/src/com/googlecode/goclipse/core/operations/GoToolManager.java

@@ -14,6 +14,7 @@
 
 import melnorme.lang.ide.core.LangCore;
 import melnorme.lang.ide.core.operations.AbstractToolsManager;
+import melnorme.utilbox.concurrency.OperationCancellation;
 import melnorme.utilbox.misc.Location;
 import melnorme.utilbox.process.ExternalProcessHelper.ExternalProcessResult;
 
@@ -35,7 +36,7 @@ public static GoToolManager getDefault() {
 	/* -----------------  ----------------- */
 
 	public ExternalProcessResult runBuildTool(GoEnvironment goEnv, IProgressMonitor pm, Location workingDir, 
-			List<String> commandLine) throws CoreException {
+			List<String> commandLine) throws CoreException, OperationCancellation {
 
 		ProcessBuilder pb = goEnv.createProcessBuilder(commandLine, workingDir.path);
 		return runTool(null, pm, pb);

plugin_ide.ui/src/com/googlecode/goclipse/ui/actions/GoOracleOpenDefinitionOperation.java

@@ -16,6 +16,7 @@
 import melnorme.lang.ide.ui.tools.console.DaemonToolMessageConsole;
 import melnorme.lang.tooling.ast.SourceRange;
 import melnorme.lang.tooling.ops.FindDefinitionResult;
+import melnorme.utilbox.concurrency.OperationCancellation;
 import melnorme.utilbox.core.CommonException;
 import melnorme.utilbox.process.ExternalProcessHelper.ExternalProcessResult;
 
@@ -47,7 +48,7 @@ protected void prepareOperation() throws CoreException {
 
 	@Override
 	protected FindDefinitionResult performLongRunningComputation_doAndGetResult(IProgressMonitor monitor) 
-			throws CoreException {
+			throws CoreException, OperationCancellation {
 		String goOraclePath = GoToolPreferences.GO_ORACLE_Path.get();
 
 		GoEnvironment goEnv = GoProjectEnvironment.getGoEnvironment(project);

plugin_ide.ui/src/com/googlecode/goclipse/ui/actions/GocodeClient.java

@@ -1,5 +1,17 @@
+/*******************************************************************************
+ * Copyright (c) 2015, 2015 Bruno Medeiros and other Contributors.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ *     Bruno Medeiros - initial API and implementation
+ *******************************************************************************/
 package com.googlecode.goclipse.ui.actions;
 
+import melnorme.lang.ide.core.utils.EclipseUtils;
+import melnorme.utilbox.concurrency.OperationCancellation;
 import melnorme.utilbox.core.CommonException;
 import melnorme.utilbox.process.ExternalProcessHelper.ExternalProcessResult;
 
@@ -9,7 +21,7 @@
 import com.googlecode.goclipse.tooling.env.GoEnvironment;
 import com.googlecode.goclipse.tooling.gocode.GocodeCompletionOperation;
 
-public class GocodeClient extends GocodeCompletionOperation<CommonException> {
+public class GocodeClient extends GocodeCompletionOperation {
 
 	protected final IProgressMonitor pm;
 
@@ -19,7 +31,10 @@ public GocodeClient(String gocodePath, GoEnvironment goEnvironment, IProgressMon
 	}
 
 	@Override
-	protected ExternalProcessResult runGocodeProcess(ProcessBuilder pb, String input) throws CommonException {
+	protected ExternalProcessResult runGocodeProcess(ProcessBuilder pb, String input) 
+			throws CommonException, OperationCancellation {
+		EclipseUtils.checkMonitorCancelation(pm);
+
 		return GoToolManager.getDefault().new RunEngineClientOperation(pb, pm).doRunProcess(input, false);
 	}
 

plugin_ide.ui/src/com/googlecode/goclipse/ui/editor/GocodeCompletionProposalComputer.java

@@ -1,10 +1,13 @@
 package com.googlecode.goclipse.ui.editor;
 
+import static melnorme.utilbox.core.Assert.AssertNamespace.assertTrue;
+
 import java.util.ArrayList;
 import java.util.List;
 
 import melnorme.lang.ide.core.LangCore;
 import melnorme.utilbox.collections.ArrayList2;
+import melnorme.utilbox.concurrency.OperationCancellation;
 import melnorme.utilbox.core.CommonException;
 import melnorme.utilbox.misc.StringUtil;
 import melnorme.utilbox.process.ExternalProcessHelper.ExternalProcessResult;
@@ -51,8 +54,7 @@ public GocodeCompletionProposalComputer(IEditorPart editor, String filePath, int
 	}
 
 	@Override
-	public ICompletionProposal[] computeCompletionProposals()
-			throws CoreException {
+	public ICompletionProposal[] computeCompletionProposals() throws CoreException {
 
 		ArrayList<ICompletionProposal> results = new ArrayList<ICompletionProposal>();
 
@@ -67,23 +69,15 @@ public ICompletionProposal[] computeCompletionProposals()
 			String stdout = processResult.getStdOutBytes().toString(StringUtil.UTF8);
 			List<String> completions = new ArrayList2<>(GocodeClient.LINE_SPLITTER.split(stdout));
 
-//			CodeContext codeContext = codeContexts.get(filePath);
-//			if (codeContext == null) {
-//				try {
-//					codeContext = CodeContext.getCodeContext(project, filePath, document.get());
-//				} catch (IOException e) {
-//					throw LangCore.createCoreException("Error during code Context:", e);
-//				}
-//			}
-
-
 			for (String completionEntry : completions) {
 				handleResult(offset, /*codeContext,*/ results, prefix, completionEntry);
 			}
 
 			return results.toArray(new ICompletionProposal[] {});
 		} catch (CommonException e) {
 			throw LangCore.createCoreException(e.getMessage(), e.getCause());
+		} catch (OperationCancellation e) {
+			throw LangCore.createCoreException("Timeout invoking content assist.", null);
 		}
 
 	}

plugin_ide.ui/src/com/googlecode/goclipse/ui/editor/actions/AbstractEditorGoToolOperation.java

@@ -14,6 +14,7 @@
 import static melnorme.lang.ide.ui.editor.EditorUtils.getEditorDocument;
 import melnorme.lang.ide.core.LangCore;
 import melnorme.lang.ide.ui.actions.AbstractEditorOperation;
+import melnorme.utilbox.concurrency.OperationCancellation;
 import melnorme.utilbox.process.ExternalProcessHelper.ExternalProcessResult;
 
 import org.eclipse.core.resources.IProject;
@@ -54,7 +55,7 @@ protected void prepareOperation() throws CoreException {
 	protected abstract void prepareProcessBuilder(GoEnvironment goEnv) throws CoreException;
 
 	@Override
-	protected void performLongRunningComputation_do(IProgressMonitor pm) throws CoreException {
+	protected void performLongRunningComputation_do(IProgressMonitor pm) throws CoreException, OperationCancellation {
 
 		IProject project = null;
 		ExternalProcessResult processResult = 

plugin_tooling/src/com/googlecode/goclipse/tooling/gocode/GocodeCompletionOperation.java

@@ -13,13 +13,14 @@
 import java.util.regex.Pattern;
 
 import melnorme.utilbox.collections.ArrayList2;
+import melnorme.utilbox.concurrency.OperationCancellation;
 import melnorme.utilbox.core.CommonException;
 import melnorme.utilbox.process.ExternalProcessHelper.ExternalProcessResult;
 
 import com.googlecode.goclipse.tooling.env.GoEnvironment;
 
 
-public abstract class GocodeCompletionOperation<EXC extends Exception> {
+public abstract class GocodeCompletionOperation {
 
 	public static final boolean USE_TCP = true;
 
@@ -31,7 +32,7 @@ public GocodeCompletionOperation(GoEnvironment goEnvironment, String gocodePath)
 		this.gocodePath = gocodePath;
 	}
 
-	protected void setLibPathForEnvironment() throws CommonException, EXC {
+	protected void setLibPathForEnvironment() throws CommonException, OperationCancellation {
 
 		ArrayList2<String> arguments = new ArrayList2<>(gocodePath);
 
@@ -47,7 +48,8 @@ protected void setLibPathForEnvironment() throws CommonException, EXC {
 		runGocodeProcess(pb, null);
 	}
 
-	public ExternalProcessResult execute(String filePath, String bufferText, int offset) throws CommonException, EXC {
+	public ExternalProcessResult execute(String filePath, String bufferText, int offset) 
+			throws CommonException, OperationCancellation {
 
 		setLibPathForEnvironment();
 
@@ -72,7 +74,8 @@ public ExternalProcessResult execute(String filePath, String bufferText, int off
 		return processResult;
 	}
 
-	protected abstract ExternalProcessResult runGocodeProcess(ProcessBuilder pb, String input) throws CommonException;
+	protected abstract ExternalProcessResult runGocodeProcess(ProcessBuilder pb, String input) 
+			throws CommonException, OperationCancellation;
 
 	// TODO: move the code that process gocode result to here