[master] Fix CS

Author: zored

.github/workflows/ci.yml

@@ -12,14 +12,14 @@ jobs:
         - macos-latest
     steps:
       - uses: actions/setup-go@v2
-        with: { go-version: ^1.14 }
+        with: { go-version: ^1.14.5 }
       - uses: actions/checkout@v2
       - run: go test
-      - run: go build -o edit
+      - run: go build -o zored-edit-${{ matrix.os }}-${{ github.ref }}
       - uses: softprops/action-gh-release@v1
         if: "startsWith(github.ref, 'refs/tags/v')"
         env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         with:
          files: |
-           edit-${{ matrix.os }}-${{ github.ref }}
+           zored-edit-*

src/service/formatters/interface.go

@@ -6,4 +6,4 @@ type (
 	IFormatter interface {
 		Format(tokens_ tokens.Tokens, options *Options) string
 	}
-)
+)

src/service/navigation/position.go

@@ -12,7 +12,7 @@ func NewPosition(line int, column int) *Position { return &Position{Column: colu
 func NewZeroPosition() *Position                 { return &Position{Column: BadNumber, Line: BadNumber} }
 func NewStartPosition() *Position                { return &Position{Column: 1, Line: 1} }
 
-func (p *Position) String() string    { return fmt.Sprintf("%d:%d", p.Line, p.Column) }
+func (p *Position) String() string   { return fmt.Sprintf("%d:%d", p.Line, p.Column) }
 func (p *Position) Wrong() bool      { return p.Column == BadNumber }
 func (p *Position) LineIndex() int   { return p.Line - 1 }
 func (p *Position) ColumnIndex() int { return p.Column - 1 }

src/service/navigation/position_interval.go

@@ -4,5 +4,7 @@ type Interval struct {
 	Start, Stop *Position
 }
 
-func NewEmptyInterval() *Interval {return &Interval{Start: NewZeroPosition(), Stop: NewZeroPosition()}}
-func NewInterval(start *Position, stop *Position) *Interval {return &Interval{Start: start, Stop: stop}}
+func NewEmptyInterval() *Interval { return &Interval{Start: NewZeroPosition(), Stop: NewZeroPosition()} }
+func NewInterval(start *Position, stop *Position) *Interval {
+	return &Interval{Start: start, Stop: stop}
+}

src/service/tokenizers/tokenizer.go

@@ -93,11 +93,11 @@ func (p *tokenizer) getWrapperStart(linesTillCursor []string, cursor *navigation
 }
 
 func (p *tokenizer) getWrapperEnd(
-    linesTillCursor []string,
-    startPosition *navigation.Position,
-    wrapper *tokens.Wrappers,
-    separator_ tokens.Separator,
-    fileScanner *bufio.Scanner,
+	linesTillCursor []string,
+	startPosition *navigation.Position,
+	wrapper *tokens.Wrappers,
+	separator_ tokens.Separator,
+	fileScanner *bufio.Scanner,
 ) (*navigation.Position, tokens.Tokens, error) {
 	result := navigation.NewPosition(startPosition.Line, startPosition.Column)
 	resultTokensBuffer := tokens.NewTokenBuffer(wrapper, separator_)