Merge branch 'improve-1'

Author: nedpals

errgoengine.go

@@ -160,7 +160,7 @@ func (e *ErrgoEngine) Analyze(workingPath, msg string) (*CompiledErrorTemplate,
 	return template, contextData, nil
 }
 
-func (e *ErrgoEngine) Translate(template *CompiledErrorTemplate, contextData *ContextData) string {
+func (e *ErrgoEngine) Translate(template *CompiledErrorTemplate, contextData *ContextData) (mainExp string, fullExp string) {
 	expGen := &ExplainGenerator{errorName: template.Name}
 	fixGen := &BugFixGenerator{}
 
@@ -170,5 +170,6 @@ func (e *ErrgoEngine) Translate(template *CompiledErrorTemplate, contextData *Co
 
 	output := e.OutputGen.Generate(contextData, expGen, fixGen)
 	defer e.OutputGen.Reset()
-	return output
+
+	return expGen.mainExp.String(), output
 }

error_templates/test_utils/test_utils.go

@@ -183,7 +183,7 @@ func (cases TestCases) Execute(t *testing.T) {
 						)
 					}
 
-					output := cases.engine.Translate(template, data)
+					_, output := cases.engine.Translate(template, data)
 					if output != tCase.ExpectedOutput {
 						diff := dmp.DiffMain(escapeOutput(tCase.ExpectedOutput), escapeOutput(output), true)
 						t.Errorf("\n======== Expected ========\n%s\n=========== Got ===========\n%s\n=========== Diff===========\n%s", tCase.ExpectedOutput, output, dmp.DiffPrettyText(diff))