Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: lint issues #280

Merged
merged 1 commit into from
Mar 8, 2024
Merged

fix: lint issues #280

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions ansi/codeblock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,9 @@ const (
chromaStyleTheme = "charm"
)

var (
// mutex for synchronizing access to the chroma style registry.
// Related https://github.com/alecthomas/chroma/pull/650
mutex = sync.Mutex{}
)
// mutex for synchronizing access to the chroma style registry.
// Related https://github.com/alecthomas/chroma/pull/650
var mutex = sync.Mutex{}

// A CodeBlockElement is used to render code blocks.
type CodeBlockElement struct {
Expand Down
18 changes: 9 additions & 9 deletions ansi/renderer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ package ansi
import (
"bytes"
"encoding/json"
"io/ioutil"
"os"
"path/filepath"
"strings"
"testing"
Expand Down Expand Up @@ -35,11 +35,11 @@ func TestRenderer(t *testing.T) {
sn := filepath.Join(examplesDir, bn+".style")
tn := filepath.Join("../testdata", bn+".test")

in, err := ioutil.ReadFile(f)
in, err := os.ReadFile(f)
if err != nil {
t.Fatal(err)
}
b, err := ioutil.ReadFile(sn)
b, err := os.ReadFile(sn)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -77,15 +77,15 @@ func TestRenderer(t *testing.T) {

// generate
if generateExamples {
err = ioutil.WriteFile(tn, buf.Bytes(), 0644)
err = os.WriteFile(tn, buf.Bytes(), 0644)
if err != nil {
t.Fatal(err)
}
continue
}

// verify
td, err := ioutil.ReadFile(tn)
td, err := os.ReadFile(tn)
if err != nil {
t.Fatal(err)
}
Expand All @@ -108,11 +108,11 @@ func TestRendererIssues(t *testing.T) {
t.Run(bn, func(t *testing.T) {
tn := filepath.Join(issuesDir, bn+".test")

in, err := ioutil.ReadFile(f)
in, err := os.ReadFile(f)
if err != nil {
t.Fatal(err)
}
b, err := ioutil.ReadFile("../styles/dark.json")
b, err := os.ReadFile("../styles/dark.json")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -150,15 +150,15 @@ func TestRendererIssues(t *testing.T) {

// generate
if generateIssues {
err = ioutil.WriteFile(tn, buf.Bytes(), 0644)
err = os.WriteFile(tn, buf.Bytes(), 0644)
if err != nil {
t.Fatal(err)
}
return
}

// verify
td, err := ioutil.ReadFile(tn)
td, err := os.ReadFile(tn)
if err != nil {
t.Fatal(err)
}
Expand Down
25 changes: 13 additions & 12 deletions glamour_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@ package glamour

import (
"bytes"
"io/ioutil"
"io"
"os"
"strings"
"testing"
)
Expand All @@ -21,7 +22,7 @@ func TestTermRendererWriter(t *testing.T) {
t.Fatal(err)
}

in, err := ioutil.ReadFile(markdown)
in, err := os.ReadFile(markdown)
if err != nil {
t.Fatal(err)
}
Expand All @@ -35,22 +36,22 @@ func TestTermRendererWriter(t *testing.T) {
t.Fatal(err)
}

b, err := ioutil.ReadAll(r)
b, err := io.ReadAll(r)
if err != nil {
t.Fatal(err)
}

// generate
if generate {
err := ioutil.WriteFile(testFile, b, 0644)
err := os.WriteFile(testFile, b, 0644)
if err != nil {
t.Fatal(err)
}
return
}

// verify
td, err := ioutil.ReadFile(testFile)
td, err := os.ReadFile(testFile)
if err != nil {
t.Fatal(err)
}
Expand All @@ -69,7 +70,7 @@ func TestTermRenderer(t *testing.T) {
t.Fatal(err)
}

in, err := ioutil.ReadFile(markdown)
in, err := os.ReadFile(markdown)
if err != nil {
t.Fatal(err)
}
Expand All @@ -80,7 +81,7 @@ func TestTermRenderer(t *testing.T) {
}

// verify
td, err := ioutil.ReadFile(testFile)
td, err := os.ReadFile(testFile)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -121,7 +122,7 @@ func TestWithPreservedNewLines(t *testing.T) {
t.Fatal(err)
}

in, err := ioutil.ReadFile("testdata/preserved_newline.in")
in, err := os.ReadFile("testdata/preserved_newline.in")
if err != nil {
t.Fatal(err)
}
Expand All @@ -132,7 +133,7 @@ func TestWithPreservedNewLines(t *testing.T) {
}

// verify
td, err := ioutil.ReadFile("testdata/preserved_newline.test")
td, err := os.ReadFile("testdata/preserved_newline.test")
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -167,7 +168,7 @@ func TestStyles(t *testing.T) {
}

func TestRenderHelpers(t *testing.T) {
in, err := ioutil.ReadFile(markdown)
in, err := os.ReadFile(markdown)
if err != nil {
t.Fatal(err)
}
Expand All @@ -178,7 +179,7 @@ func TestRenderHelpers(t *testing.T) {
}

// verify
td, err := ioutil.ReadFile(testFile)
td, err := os.ReadFile(testFile)
if err != nil {
t.Fatal(err)
}
Expand Down Expand Up @@ -209,7 +210,7 @@ func TestCapitalization(t *testing.T) {
}

// expected outcome
td, err := ioutil.ReadFile("testdata/capitalization.test")
td, err := os.ReadFile("testdata/capitalization.test")
if err != nil {
t.Fatal(err)
}
Expand Down
Loading