go coverage combine 🎄🎆

lua/go/coverage.lua

@@ -90,7 +90,16 @@ function M.add(bufnr, signs)
       if placed[lnum] and (placed[lnum] == 'goCoverageUncovered' or sign_name == 'goCoverageUncovered') then
         sg = 'goCoveragePartial'
       end
-      log(lnum, covered, sign_name, bufnr) --verbose
+
+      if lnum == s.range.start.line then
+        local start_ch = s.range.start.character
+        local line = vim.api.nvim_buf_get_lines(bufnr, lnum - 1, lnum, false)[1]
+        if line and start_ch >= line:len() - 1 and placed[lnum] then
+          log(start)
+          log(lnum, covered, sign_name, bufnr) --verbose
+          sg = placed[lnum]
+        end
+      end
       if (covered == 1 and not _GO_NVIM_CFG.gocoverage_skip_covered) or covered == 0 then
         to_place[#to_place + 1] = {
           id = lnum,
@@ -102,6 +111,7 @@ function M.add(bufnr, signs)
         }
       end
 
+      ::continue::
       placed[lnum] = sg
     end
   end

lua/tests/fixtures/coverage/branch.go

@@ -10,7 +10,7 @@ func branch(a, b int) int {
 		return 20
 	}
 
-	if a == 11 {
+	if (branch(10, 0) == 10 && branch(0, 10) == 2) && branch(20, 10) == 10 && b == 10 && a == 11 {
 		return 11
 	}
 

lua/tests/fixtures/coverage/branch_test.go

@@ -24,6 +24,11 @@ func Test_branch(t *testing.T) {
 			args: args{b: 10},
 			want: 20,
 		},
+		{
+			name: "b10",
+			args: args{},
+			want: 0,
+		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -59,7 +64,7 @@ func TestBranch(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			if got := branch(tt.args.a, tt.args.b); got == tt.want {
+			if got := branch(tt.args.a, tt.args.b); got != tt.want {
 				t.Errorf("branch() = %v, want %v", got, tt.want)
 			}
 		})

lua/tests/fixtures/coverage/cover.cov

@@ -0,0 +1,10 @@
+mode: set
+github.com/go.nvim/branch.go:5.27,6.13 1 1
+github.com/go.nvim/branch.go:9.2,9.13 1 1
+github.com/go.nvim/branch.go:13.2,13.95 1 1
+github.com/go.nvim/branch.go:17.2,17.13 1 1
+github.com/go.nvim/branch.go:21.2,21.14 1 1
+github.com/go.nvim/branch.go:6.13,8.3 1 1
+github.com/go.nvim/branch.go:9.13,11.3 1 1
+github.com/go.nvim/branch.go:13.95,15.3 1 0
+github.com/go.nvim/branch.go:17.13,19.3 1 0