fix: reset postfix modifier position if invalid (#14)

grievouz · web-flow · commit 6db95337ca65 · 2025-01-16T08:45:45.000+01:00
* fix: reset postfix modifier position if invalid

* test: add test case for resetting postfix modifier position
diff --git a/pkg/twmerge/create-tailwind-merge_test.go b/pkg/twmerge/create-tailwind-merge_test.go
@@ -522,6 +522,10 @@ func TestTailwindMerge(t *testing.T) {
 			in:  "hover:bg-red-500/90",
 			out: "hover:bg-red-500/90",
 		},
+		{
+			in:  "group-has-[[data-sidebar=menu-action]]/menu-item:pr-8 group-has-[[data-sidebar=menu-action]]/menu-item:pr-6",
+			out: "group-has-[[data-sidebar=menu-action]]/menu-item:pr-6",
+		},
 	}
 
 	for _, tc := range tt {
diff --git a/pkg/twmerge/modifier-utils.go b/pkg/twmerge/modifier-utils.go
@@ -49,6 +49,8 @@ func MakeSplitModifiers(conf *TwMergeConfig) SplitModifiersFn {
 		// fix case where there is modifier & maybePostfix which causes maybePostfix to be beyond size of baseClass!
 		if maybePostfixModPosition != -1 && maybePostfixModPosition > modifierStart {
 			maybePostfixModPosition -= modifierStart
+		} else {
+			maybePostfixModPosition = -1
 		}
 
 		return baseClass, modifiers, hasImportant, maybePostfixModPosition

Original file line number	Diff line number	Diff line change
`@@ -49,6 +49,8 @@ func MakeSplitModifiers(conf *TwMergeConfig) SplitModifiersFn {`
`49`	`49`	`// fix case where there is modifier & maybePostfix which causes maybePostfix to be beyond size of baseClass!`
`50`	`50`	`if maybePostfixModPosition != -1 && maybePostfixModPosition > modifierStart {`
`51`	`51`	`maybePostfixModPosition -= modifierStart`
	`52`	`+ } else {`
	`53`	`+ maybePostfixModPosition = -1`
`52`	`54`	`}`
`53`	`55`
`54`	`56`	`return baseClass, modifiers, hasImportant, maybePostfixModPosition`