Skip to content

Commit

Permalink
gopls/internal/test/marker: fix test breakage due to semantic conflict
Browse files Browse the repository at this point in the history
Fix the semantic conflict of CL 550355 and CL 548276.

Change-Id: I5bf92a228032bbbf8e64193794d3c42714758fa9
Reviewed-on: https://go-review.googlesource.com/c/tools/+/556835
LUCI-TryBot-Result: Go LUCI <[email protected]>
Auto-Submit: Robert Findley <[email protected]>
Auto-Submit: Alan Donovan <[email protected]>
Reviewed-by: Alan Donovan <[email protected]>
  • Loading branch information
findleyr committed Jan 18, 2024
1 parent 470afda commit 72a36a7
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ func _() {
-- effects/effects.go --
package effects

func effects(x, y int) int { //@codeaction("y", "y", "refactor.rewrite", effects)
func effects(x, y int) int { //@codeaction("y", "y", "refactor.rewrite", effects), diag("y", re"unused")
return x
}

Expand All @@ -228,7 +228,7 @@ func _() {
-- @effects/effects/effects.go --
package effects

func effects(x int) int { //@codeaction("y", "y", "refactor.rewrite", effects)
func effects(x int) int { //@codeaction("y", "y", "refactor.rewrite", effects), diag("y", re"unused")
return x
}

Expand Down

0 comments on commit 72a36a7

Please sign in to comment.