keep spaces in comments (#15)

Author: david-littlefarmer

Makefile

@@ -5,13 +5,13 @@ install:
 	go install .
 
 rerun-install:
-	rerun -watch . -ignore out -run sh -c 'go install .'
+	go run github.com/goware/rerun/cmd/rerun -watch . -ignore out -run sh -c 'go install .'
 
 rerun-1:
-	rerun -watch . -ignore out -run sh -c 'go run . -s _examples/e1.ridl'
+	go run github.com/goware/rerun/cmd/rerun -watch . -ignore out -run sh -c 'go run . -s _examples/e1.ridl'
 
 rerun-2:
-	rerun -watch . -ignore out -run sh -c 'go run . -s _examples/e2.ridl'
+	go run github.com/goware/rerun/cmd/rerun -watch . -ignore out -run sh -c 'go run . -s _examples/e2.ridl'
 
 test:
 	go test -v -coverprofile=coverage.txt -covermode=atomic ./...

formatter/comments.go

@@ -19,22 +19,25 @@ func parseComment(s string) *comment {
 		count := 1
 
 		content := parts[1]
-		if strings.HasPrefix(content, " ") {
-			content = strings.TrimSpace(strings.SplitN(parts[1], " ", 2)[1])
-		} else if strings.HasPrefix(content, "!") {
+
+		if strings.HasPrefix(content, "!") {
 			hidden = true
-			content = strings.TrimSpace(strings.SplitN(parts[1], "!", 2)[1])
+			content = strings.SplitN(content, "!", 2)[1]
 		} else if strings.HasPrefix(content, "#") {
 			content, count = countHashes(content, count)
 			sub, found := strings.CutPrefix(content, "!")
 			if found {
 				hidden = true
-				content = strings.TrimSpace(sub)
+				content = sub
 			}
 		}
 
+		if !strings.HasPrefix(content, " ") {
+			content = " " + content
+		}
+
 		c := comment{
-			content:   strings.TrimSpace(content),
+			content:   strings.TrimRight(content, " "),
 			hidden:    hidden,
 			hashCount: count,
 			original:  parts[1],
@@ -60,9 +63,9 @@ func parseAndDivideInlineComment(s string) (string, *comment) {
 func (c comment) getString() string {
 	var s string
 	if c.hidden {
-		s = fmt.Sprintf("%s! %s", strings.Repeat("#", c.hashCount), c.content)
+		s = fmt.Sprintf("%s!%s", strings.Repeat("#", c.hashCount), c.content)
 	} else {
-		s = fmt.Sprintf("%s %s", strings.Repeat("#", c.hashCount), c.content)
+		s = fmt.Sprintf("%s%s", strings.Repeat("#", c.hashCount), c.content)
 	}
 
 	return strings.TrimSpace(s)

formatter/processor.go

@@ -4,7 +4,6 @@ import (
 	"bufio"
 	"fmt"
 	"io"
-	"regexp"
 	"sort"
 	"strconv"
 	"strings"
@@ -375,7 +374,7 @@ func (f *form) removeDoubleLines(s string) string {
 	var modifiedLines []string
 	var emptyLine bool
 
-	for _, line := range strings.Split(s, "\n") {
+	for line := range strings.SplitSeq(s, "\n") {
 		if line != "" || !emptyLine {
 			modifiedLines = append(modifiedLines, line)
 			emptyLine = line == ""
@@ -386,8 +385,27 @@ func (f *form) removeDoubleLines(s string) string {
 }
 
 func reduceSpaces(input string) string {
-	pattern := regexp.MustCompile(`\s+`)
-	return pattern.ReplaceAllString(input, " ")
+	// Find the position of the '#' character
+	hashIndex := strings.Index(input, "#")
+	if hashIndex == -1 {
+		// If there's no '#', just reduce spaces in the entire string
+		return reduceSpacesInString(input)
+	}
+
+	// Separate the part before and after the '#'
+	beforeHash := input[:hashIndex]
+	afterHash := input[hashIndex:]
+
+	// Reduce spaces in the part before the '#'
+	reduced := reduceSpacesInString(beforeHash)
+
+	return reduced + afterHash
+}
+
+func reduceSpacesInString(s string) string {
+	// Split the string and join using a single space
+	parts := strings.Fields(s)
+	return strings.Join(parts, " ")
 }
 
 func removeSpaces(input string) string {

go.mod

@@ -1,11 +1,16 @@
 module github.com/webrpc/ridlfmt
 
-go 1.20
+go 1.24.0
 
 require github.com/stretchr/testify v1.9.0
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
+	github.com/fsnotify/fsnotify v1.9.0 // indirect
+	github.com/goware/rerun v0.1.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
+	golang.org/x/sys v0.37.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
+
+tool github.com/goware/rerun/cmd/rerun

go.sum

@@ -1,9 +1,15 @@
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/goware/rerun v0.1.0 h1:DF+CyZIkARtU7FyvUZLKzwXARxRqx/lEre8V9sGjAK4=
+github.com/goware/rerun v0.1.0/go.mod h1:EcV6fsyl4+4qV298L42JErY+s6WQbQaUtcHh6ztOR6s=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+golang.org/x/sys v0.37.0 h1:fdNQudmxPjkdUTPnLn5mdQv7Zwvbvpaxqs831goi9kQ=
+golang.org/x/sys v0.37.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=

main_test.go

@@ -83,7 +83,7 @@ func testHelpFlag(t *testing.T) {
 }
 
 const testInput string = `
-      webrpc    =    v1    #    version of webrpc schema format (ridl or json)
+      webrpc    =    v1    # version of webrpc schema format (ridl or json)
    name    = 		example # name of your backend app
 	version=v0.0.1#version of your schema
 
@@ -94,6 +94,7 @@ enum Intent: string
   -       closeSession
 
 enum           Kind:            uint32
+      #   user   
   - USER
 # admin
   - ADMIN
@@ -156,7 +157,7 @@ service ExampleService # oof
   	@  auth   :   ApiKeyAuth @   who    dsa   :   J    W    T   ## dadsadadsa
 - Ping()
  - Status() => (status: bool)
-  	@     internal   @   public   @ stringo :  " string with spaces  "   ##      dsada s dsa
+  	@     internal   @   public   @ stringo :  " string with spaces  "   ##    multiple hashes and spaces  
   - Version() => (version: Version)
 @public
    - GetUser   (   header   :    map  <   string   ,   string   >   ,   userID   :    uint64   )   =>   (  code  :   uint32   ,   user  :   User  )
@@ -186,6 +187,7 @@ enum Intent: string
   - closeSession
 
 enum Kind: uint32
+  #   user
   - USER
   # admin
   - ADMIN
@@ -201,7 +203,7 @@ struct User
 
   - username: string
     + json = USERNAME
-    + go.tag.db = username #! far away
+    + go.tag.db = username #!       far away
 
   #! role?
   #! role!
@@ -248,7 +250,7 @@ service ExampleService # oof
     @auth:ApiKeyAuth @whodsa:JWT ## dadsadadsa
   - Ping()
   - Status() => (status: bool)
-    @internal @public @stringo:" string with spaces  " ## dsada s dsa
+    @internal @public @stringo:" string with spaces  " ##    multiple hashes and spaces
   - Version() => (version: Version)
     @public
   - GetUser(header: map<string,string>, userID: uint64) => (code: uint32, user: User)