fix: minor code refactors

Author: Oudwins

pkg/twmerge/class-utils.go

@@ -26,7 +26,7 @@ func MakeGetClassGroupId(conf *TwMergeConfig) GetClassGroupIdfn {
 			}
 		}
 
-		if classMap.Validators != nil && len(classMap.Validators) > 0 {
+		if len(classMap.Validators) > 0 {
 			remainingClass := strings.Join(classParts[i:], string(conf.ClassSeparator))
 
 			for _, validator := range classMap.Validators {

pkg/twmerge/create-tailwind-merge_test.go

@@ -528,9 +528,9 @@ func TestTailwindMerge(t *testing.T) {
 		got := Merge(tc.in)
 		if areStringsEqual(got, tc.out) == false {
 			t.Errorf("twMerge failed -> | in: %v | %v != %v", tc.in, got, tc.out)
-		} else {
+		} /* else {
 			// t.Log("twMerge passed -> | in: ", tc.in, " | out: ", got, " | expected: ", tc.out)
-		}
+		} */
 	}
 }
 

pkg/twmerge/validators.go

@@ -96,18 +96,12 @@ func IsNumber(val string) bool {
 
 func IsInteger(val string) bool {
 	_, err := strconv.Atoi(val)
-	if err != nil {
-		return false
-	}
-	return true
+	return err == nil
 }
 
 func IsFloat(val string) bool {
 	_, err := strconv.ParseFloat(val, 64)
-	if err != nil {
-		return false
-	}
-	return true
+	return err == nil
 }
 
 func IsLengthOnly(val string) bool {