Merge pull request #82 from conneroisu/devit

devit
conneroisu · Jul 31, 2024 · 66f9df4 · 66f9df4
2 parents 7072e6d + e8f10e3
commit 66f9df4
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 16 deletions.
diff --git a/tools/seltabls/cmd/cmds/static.go b/tools/seltabls/cmd/cmds/static.go
@@ -42,14 +42,14 @@ var (
 )
 
 // NewStaticCmd createa a new command for the static command.
-func NewStaticCmd(ctx context.Context) *cobra.Command {
+func NewStaticCmd(_ context.Context) *cobra.Command {
 	return &cobra.Command{
 		Use:   "static",
 		Short: "Statically define html given a url.",
 		Long: `
 Statically define html given a url.
 `,
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: func(cmd *cobra.Command, _ []string) error {
 			cmd.PersistentFlags().StringVarP(
 				&uuri,
 				"url",
@@ -178,7 +178,10 @@ func getURLFileName(fileURL string) (string, error) {
 
 	// Check for a successful response status
 	if resp.StatusCode != http.StatusOK {
-		return "", fmt.Errorf("received non-200 response code: %d", resp.StatusCode)
+		return "", fmt.Errorf(
+			"received non-200 response code: %d",
+			resp.StatusCode,
+		)
 	}
 
 	body, err := io.ReadAll(resp.Body)

diff --git a/tools/seltabls/cmd/cmds/version.go b/tools/seltabls/cmd/cmds/version.go
@@ -8,7 +8,7 @@ func NewVersionCmd() *cobra.Command {
 		Use:   "version",
 		Short: "Print the version number of the seltabls command",
 		Long:  `All software has versions. This is seltabls's`,
-		Run: func(cmd *cobra.Command, args []string) {
+		Run: func(cmd *cobra.Command, _ []string) {
 			cmd.Println("seltabls version 0.1.0.5.0.0-beta1.final")
 		},
 	}

diff --git a/tools/seltabls/main.go b/tools/seltabls/main.go
@@ -32,9 +32,9 @@ func main() {
 // @ignore: script, style, link, img, footer, header
 // @occurrences: 2
 type TableStruct struct {
-	A string `hSel:"html>body>div>table>tbody>tr.row_even"                         dSel:"html>body>div.footer>div>span>a[href]"  ctl:"$text"`
+	A string `hSel:"html>body>div>table>tbody>tr.row_even" dSel:"html>body>div.footer>div>span>a[href]"  ctl:"$text"`
 	B string `hSel:""                                      dSel:"html>body>div>table>tbody>tr.row_odd"   ctl:"$text"`
-	C string `hSel:"html>head>link[href]"                                    dSel:"html>body>div"                          ctl:"$text"`
-	D string `hSel:"" dSel:"html>body>div.footer>div>span>a[href]"  ctl:"$text"`
+	C string `hSel:"html>head>link[href]"                  dSel:"html>body>div"                          ctl:"$text"`
+	D string `hSel:""                                      dSel:"html>body>div.footer>div>span>a[href]"  ctl:"$text"`
 	E string `hSel:""                                      dSel:"htmle>body>div.footer>div>span>a[href]" ctl:"$text"`
 }
diff --git a/tools/seltabls/pkg/analysis/hover.go b/tools/seltabls/pkg/analysis/hover.go
@@ -118,14 +118,22 @@ func GetSelectorHover(
 							position,
 							fset,
 						)
-						log.Debugf("calling IsPositionInNode: %v time: %s\n", inPosition, time.Since(start))
+						log.Debugf(
+							"calling IsPositionInNode: %v time: %s\n",
+							inPosition,
+							time.Since(start),
+						)
 						// Check if the position is within a struct tag
 						inTag := parsers.IsPositionInTag(
 							structNodes[i],
 							position,
 							fset,
 						)
-						log.Debugf("calling IsPositionInTag: %v time: %s\n", inTag, time.Since(start))
+						log.Debugf(
+							"calling IsPositionInTag: %v time: %s\n",
+							inTag,
+							time.Since(start),
+						)
 						if !inPosition && !inTag {
 							return
 						}
@@ -138,7 +146,12 @@ func GetSelectorHover(
 							fset,
 							text,
 						)
-						log.Debugf("calling PositionInStructTagValue: %v value: %v time: %s\n", inValue, val, time.Since(start))
+						log.Debugf(
+							"calling PositionInStructTagValue: %v value: %v time: %s\n",
+							inValue,
+							val,
+							time.Since(start),
+						)
 						var HTMLs []string
 						found := doc.Find(val)
 						HTMLs = make([]string, found.Length())
@@ -147,7 +160,10 @@ func GetSelectorHover(
 							eg.Go(func() error {
 								HTML, err := s.Parent().Html()
 								if err != nil {
-									return fmt.Errorf("failed to get html: %w", err)
+									return fmt.Errorf(
+										"failed to get html: %w",
+										err,
+									)
 								}
 								HTMLs[i] = fmt.Sprintf(
 									"%d:\n%s",

diff --git a/tools/seltabls/pkg/parsers/package.go b/tools/seltabls/pkg/parsers/package.go
@@ -22,7 +22,9 @@ func ValidatePackageName(name string) error {
 	// Check the rest of the characters
 	for _, ch := range name[1:] {
 		if !unicode.IsLetter(ch) && !unicode.IsDigit(ch) && ch != '_' {
-			return fmt.Errorf("package name must only contain letters, digits, and underscores")
+			return fmt.Errorf(
+				"package name must only contain letters, digits, and underscores",
+			)
 		}
 	}
 
@@ -57,7 +59,9 @@ func ValidateFileName(name string) error {
 	// Check the rest of the characters
 	for _, ch := range name[1:] {
 		if !unicode.IsLetter(ch) && !unicode.IsDigit(ch) && ch != '_' {
-			return fmt.Errorf("file name must only contain letters, digits, and underscores")
+			return fmt.Errorf(
+				"file name must only contain letters, digits, and underscores",
+			)
 		}
 	}
 	return nil

diff --git a/tools/seltabls/pkg/parsers/position.go b/tools/seltabls/pkg/parsers/position.go
@@ -52,7 +52,9 @@ func PositionInStructTagValue(
 	split := strings.Split(*text, "\n")
 	line := split[pos.Line]
 	if strings.Contains(line, "@url:") {
-		if urlMatches := urlPattern.FindStringSubmatch(line); len(urlMatches) > 1 {
+		if urlMatches := urlPattern.FindStringSubmatch(line); len(
+			urlMatches,
+		) > 1 {
 			return urlMatches[1], false
 		}
 	}

diff --git a/tools/seltabls/pkg/parsers/selectors.go b/tools/seltabls/pkg/parsers/selectors.go
@@ -45,7 +45,8 @@ func getSelectorsFromSelection(s *goquery.Selection) string {
 	// Get the selector for the current node
 	currentSelector := singleSelector(s)
 	// Combine the parent and current selectors
-	if parentSelector != empty && currentSelector != "" && parentSelector != currentSelector {
+	if parentSelector != empty && currentSelector != "" &&
+		parentSelector != currentSelector {
 		return parentSelector + childsep + currentSelector
 	} else if parentSelector != empty && currentSelector == "" {
 		return parentSelector
@@ -199,7 +200,11 @@ func singleSelector(selection *goquery.Selection) string {
 	}
 	attr, exists = selection.Attr("src")
 	if exists {
-		selector = fmt.Sprintf("%s[src='%s']", goquery.NodeName(selection), attr)
+		selector = fmt.Sprintf(
+			"%s[src='%s']",
+			goquery.NodeName(selection),
+			attr,
+		)
 	}
 	_, exists = selection.Attr("href")
 	if exists {