Skip to content
This repository has been archived by the owner on Apr 3, 2018. It is now read-only.

Commit

Permalink
another minor fix
Browse files Browse the repository at this point in the history
  • Loading branch information
bruno-medeiros committed Feb 25, 2016
1 parent c09b972 commit 5192bce
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand All @@ -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
Expand Down

0 comments on commit 5192bce

Please sign in to comment.