Small fixes for issues found when running against our codebase (#10)

* fix wrong exit code Signed-off-by: Xiang Dai <[email protected]> * remove duplicate blank in comment Signed-off-by: Xiang Dai <[email protected]> * Remove extra space Signed-off-by: Xiang Dai <[email protected]> * Refactor gci.Run Signed-off-by: Xiang Dai <[email protected]> * Small fixes for issues found when running against our codebase * Update for latest changes Co-authored-by: Xiang Dai <[email protected]> Co-authored-by: ☃ Elliot Shepherd <[email protected]>
daixiang0 · Jun 7, 2021 · 9b479ee · 9b479ee
1 parent 7eb50f3
commit 9b479ee
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/gci/gci.go b/pkg/gci/gci.go
@@ -126,7 +126,7 @@ func (p *pkg) fmt() []byte {
 			ret = append(ret, linebreak)
 		}
 	}
-	if ret[len(ret)-1] == linebreak {
+	if len(ret) > 0 && ret[len(ret)-1] == linebreak {
 		ret = ret[:len(ret)-1]
 	}
 
@@ -353,6 +353,11 @@ func Run(filename string, set *FlagSet) ([]byte, []byte, error) {
 		return nil, nil, nil
 	}
 	end := bytes.Index(src[start:], importEndFlag) + start
+
+	// in case import flags are part of a codegen template, or otherwise "wrong"
+	if start+len(importStartFlag) > end {
+		return nil, nil, nil
+	}
 
 	ret := bytes.Split(src[start+len(importStartFlag):end], []byte(linebreak))