From 5192bced453c1b13e6da90c82221d1ed7d985d82 Mon Sep 17 00:00:00 2001 From: Bruno Medeiros Date: Thu, 25 Feb 2016 18:06:13 +0000 Subject: [PATCH] another minor fix --- .../goclipse/ui/actions/GoOpenDefinitionOperation.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugin_ide.ui/src/com/googlecode/goclipse/ui/actions/GoOpenDefinitionOperation.java b/plugin_ide.ui/src/com/googlecode/goclipse/ui/actions/GoOpenDefinitionOperation.java index 46d0b2149..d54801b24 100644 --- a/plugin_ide.ui/src/com/googlecode/goclipse/ui/actions/GoOpenDefinitionOperation.java +++ b/plugin_ide.ui/src/com/googlecode/goclipse/ui/actions/GoOpenDefinitionOperation.java @@ -76,7 +76,6 @@ protected int getByteOffsetFromEncoding(String source, int charOffset, Charset c @Override protected FindDefinitionResult performLongRunningComputation_doAndGetResult(IProgressMonitor monitor) throws CoreException, CommonException, OperationCancellation { - String goOraclePath = GoToolPreferences.GO_ORACLE_Path.getDerivedValue().toString(); GoEnvironment goEnv = GoProjectEnvironment.getGoEnvironment(project); @@ -86,9 +85,10 @@ protected FindDefinitionResult performLongRunningComputation_doAndGetResult(IPro String godefPath = GoToolPreferences.GODEF_Path.getDerivedValue().toString(); return new GodefOperation(this, godefPath, goEnv, inputLoc, byteOffset).execute(cm); } catch(OperationSoftFailure | CommonException e) { - + // Try go oracle as an alternative try { + String goOraclePath = GoToolPreferences.GO_ORACLE_Path.getDerivedValue().toString(); return new GoOracleFindDefinitionOperation(goOraclePath).execute(inputLoc, byteOffset, goEnv, this, cm); } catch(OperationSoftFailure | CommonException oracleError) { // Ignore oracle error, display previous godef error