Fix zsh parser

Author: antham

shell/parser_test.go

@@ -23,4 +23,51 @@ function function_test() {
 		{Name: "f1", Description: "This is a function to run"},
 		{Name: "function_test", Description: ""},
 	})
+	fs, err = Parse("sh", []byte(`
+# This is a function to run
+function f1() {
+	echo e;
+}
+
+function function_test() {
+	echo e;
+}
+`))
+	assert.NoError(t, err)
+	assert.Len(t, fs, 2)
+	assert.Equal(t, fs, []Function{
+		{Name: "f1", Description: "This is a function to run"},
+		{Name: "function_test", Description: ""},
+	})
+	fs, err = Parse("fish", []byte(`
+function f1 -d "This is a function to run"
+	echo e
+end
+
+function f2
+	echo e
+end
+`))
+	assert.NoError(t, err)
+	assert.Len(t, fs, 2)
+	assert.Equal(t, fs, []Function{
+		{Name: "f1", Description: "This is a function to run"},
+		{Name: "f2", Description: ""},
+	})
+	fs, err = Parse("zsh", []byte(`
+# This is a function to run
+function f1 {
+	echo e
+}
+function f2 () {
+	echo e
+}
+`))
+	assert.NoError(t, err)
+	assert.Len(t, fs, 2)
+	assert.Equal(t, fs, []Function{
+		{Name: "f1", Description: "This is a function to run"},
+		{Name: "f2", Description: ""},
+	})
+
 }

shell/zsh.go

@@ -16,7 +16,7 @@ func newZshParser() *zshParser {
 		DefineTokens(tokenCurlyClose, []string{"}"}).
 		DefineTokens(tokenParenOpen, []string{"("}).
 		DefineTokens(tokenParenClose, []string{")"}).
-		DefineTokens(tokenFunction, []string{"function "}).
+		DefineTokens(tokenFunction, []string{"function"}).
 		DefineTokens(tokenComment, []string{"#"})
 	return zshParser
 }
@@ -47,7 +47,7 @@ func (zshParser *zshParser) analyzer(stream *tokenizer.Stream) ([]Function, erro
 			currentToken := stream.CurrentToken()
 			acc := ""
 			for {
-				if stream.CurrentToken().Line() != currentToken.Line() || stream.CurrentToken().Key() == tokenFunction {
+				if stream.CurrentToken().Line() != currentToken.Line() || (stream.CurrentToken().Key() == tokenFunction && stream.CurrentToken().Offset()+len(stream.CurrentToken().ValueString()) != stream.NextToken().Offset() && stream.CurrentToken().Line() != stream.PrevToken().Line()) {
 					break
 				}
 				acc = stream.CurrentToken().ValueString() + acc