Merge branch 'main' into feature/add-copy-to-clipboard

.github/CODEOWNERS

@@ -0,0 +1 @@
+* @charmbracelet/everyone

.github/dependabot.yml

@@ -0,0 +1,29 @@
+version: 2
+updates:
+  - package-ecosystem: "gomod"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+    commit-message:
+      prefix: "chore"
+      include: "scope"
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+    commit-message:
+      prefix: "chore"
+      include: "scope"
+  - package-ecosystem: "docker"
+    directory: "/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "dependencies"
+    commit-message:
+      prefix: "chore"
+      include: "scope"

.github/workflows/go.yml

@@ -14,10 +14,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
 
     - name: Set up Go
-      uses: actions/setup-go@v4
+      uses: actions/setup-go@v5
       with:
         go-version: '1.21'
 

.github/workflows/goreleaser.yml

@@ -1,3 +1,5 @@
+# yaml-language-server: $schema=https://json.schemastore.org/github-workflow.json
+
 name: goreleaser
 
 on:
@@ -21,6 +23,11 @@ jobs:
       fury_token: ${{ secrets.FURY_TOKEN }}
       nfpm_gpg_key: ${{ secrets.NFPM_GPG_KEY }}
       nfpm_passphrase: ${{ secrets.NFPM_PASSPHRASE }}
+      macos_sign_p12: ${{ secrets.MACOS_SIGN_P12 }}
+      macos_sign_password: ${{ secrets.MACOS_SIGN_PASSWORD }}
+      macos_notary_issuer_id: ${{ secrets.MACOS_NOTARY_ISSUER_ID }}
+      macos_notary_key_id: ${{ secrets.MACOS_NOTARY_KEY_ID }}
+      macos_notary_key: ${{ secrets.MACOS_NOTARY_KEY }}
   homebrew:
     name: Bump Homebrew formula
     runs-on: ubuntu-latest

.github/workflows/lint-soft.yml

@@ -0,0 +1,28 @@
+name: lint-soft
+on:
+  push:
+  pull_request:
+
+permissions:
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  pull-requests: read
+
+jobs:
+  golangci:
+    name: lint-soft
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ^1
+
+      - uses: actions/checkout@v4
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          # Optional: golangci-lint command line arguments.
+          args: --config .golangci-soft.yml --issues-exit-code=0
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          only-new-issues: true

.github/workflows/lint.yml

@@ -0,0 +1,28 @@
+name: lint
+on:
+  push:
+  pull_request:
+
+permissions:
+  contents: read
+  # Optional: allow read access to pull request. Use with `only-new-issues` option.
+  pull-requests: read
+
+jobs:
+  golangci:
+    name: lint
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install Go
+        uses: actions/setup-go@v5
+        with:
+          go-version: ^1
+
+      - uses: actions/checkout@v4
+      - name: golangci-lint
+        uses: golangci/golangci-lint-action@v6
+        with:
+          # Optional: golangci-lint command line arguments.
+          #args:
+          # Optional: show only new issues if it's a pull request. The default value is `false`.
+          only-new-issues: true

.golangci-soft.yml

@@ -0,0 +1,39 @@
+run:
+  tests: false
+
+issues:
+  include:
+    - EXC0001
+    - EXC0005
+    - EXC0011
+    - EXC0012
+    - EXC0013
+
+  max-issues-per-linter: 0
+  max-same-issues: 0
+
+linters:
+  enable:
+    - exhaustive
+    - goconst
+    - godot
+    - godox
+    - gomoddirectives
+    - goprintffuncname
+    - misspell
+    - nakedret
+    - nestif
+    - noctx
+    - nolintlint
+    - prealloc
+    - wrapcheck
+
+  # disable default linters, they are already enabled in .golangci.yml
+  disable:
+    - errcheck
+    - gosimple
+    - govet
+    - ineffassign
+    - staticcheck
+    - typecheck
+    - unused

.golangci.yml

@@ -0,0 +1,28 @@
+run:
+  tests: false
+
+issues:
+  include:
+    - EXC0001
+    - EXC0005
+    - EXC0011
+    - EXC0012
+    - EXC0013
+
+  max-issues-per-linter: 0
+  max-same-issues: 0
+
+linters:
+  enable:
+    - bodyclose
+    - goimports
+    - gosec
+    - nilerr
+    - predeclared
+    - revive
+    - rowserrcheck
+    - sqlclosecheck
+    - tparallel
+    - unconvert
+    - unparam
+    - whitespace

ansi.go

@@ -4,7 +4,7 @@ import (
 	"fmt"
 
 	"github.com/beevik/etree"
-	"github.com/charmbracelet/x/exp/term/ansi"
+	"github.com/charmbracelet/x/ansi"
 	"github.com/mattn/go-runewidth"
 )
 

config.go

@@ -30,6 +30,7 @@ type Config struct {
 	Interactive bool   `hidden:"" json:",omitempty" help:"Use an interactive form for configuration options." short:"i" group:"Settings"`
 	Language    string `json:"language,omitempty" help:"Language of code file." short:"l" group:"Settings" placeholder:"go"`
 	Theme       string `json:"theme" help:"Theme to use for syntax highlighting." short:"t" group:"Settings" placeholder:"charm"`
+	Wrap        int    `json:"wrap" help:"Wrap lines at a specific width." short:"w" group:"Settings" default:"0" placeholder:"80"`
 
 	Output         string        `json:"output,omitempty" help:"Output location for {{.svg}}, {{.png}}, or {{.webp}}." short:"o" group:"Settings" default:"" placeholder:"freeze.svg"`
 	Execute        string        `json:"-" help:"Capture output of command execution." short:"x" group:"Settings" default:""`
@@ -83,7 +84,6 @@ func expandPadding(p []float64, scale float64) []float64 {
 		return []float64{p[top] * scale, p[right] * scale, p[bottom] * scale, p[left] * scale}
 	default:
 		return []float64{0, 0, 0, 0}
-
 	}
 }
 
@@ -101,7 +101,7 @@ const (
 var userConfigPath = filepath.Join(xdg.ConfigHome, "freeze", "user.json")
 
 func loadUserConfig() (fs.File, error) {
-	return os.Open(userConfigPath)
+	return os.Open(userConfigPath) //nolint: wrapcheck
 }
 
 func saveUserConfig(config Config) error {
@@ -111,19 +111,19 @@ func saveUserConfig(config Config) error {
 
 	err := os.MkdirAll(filepath.Dir(userConfigPath), os.ModePerm)
 	if err != nil {
-		return err
+		return err //nolint: wrapcheck
 	}
 	f, err := os.Create(userConfigPath)
 	if err != nil {
-		return err
+		return err //nolint: wrapcheck
 	}
 	b, err := json.Marshal(config)
 	if err != nil {
-		return err
+		return err //nolint: wrapcheck
 	}
 	_, err = f.Write(b)
 
 	printFilenameOutput(userConfigPath)
 
-	return err
+	return err //nolint: wrapcheck
 }

cut_test.go

@@ -46,5 +46,4 @@ func TestCut(t *testing.T) {
 			t.Errorf("cut(%s, %v)", test.input, test.lines)
 		}
 	}
-
 }

error.go

@@ -7,8 +7,10 @@ import (
 	"github.com/charmbracelet/lipgloss"
 )
 
-var errorHeader = lipgloss.NewStyle().Foreground(lipgloss.Color("#F1F1F1")).Background(lipgloss.Color("#FF5F87")).Bold(true).Padding(0, 1).Margin(1).MarginLeft(2).SetString("ERROR")
-var errorDetails = lipgloss.NewStyle().Foreground(lipgloss.Color("#757575")).Margin(0, 0, 1, 2)
+var (
+	errorHeader  = lipgloss.NewStyle().Foreground(lipgloss.Color("#F1F1F1")).Background(lipgloss.Color("#FF5F87")).Bold(true).Padding(0, 1).Margin(1).MarginLeft(2).SetString("ERROR")
+	errorDetails = lipgloss.NewStyle().Foreground(lipgloss.Color("#757575")).Margin(0, 0, 1, 2)
+)
 
 func printError(title string, err error) {
 	fmt.Printf("%s\n", lipgloss.JoinHorizontal(lipgloss.Center, errorHeader.String(), title))

font/font.go

@@ -105,5 +105,10 @@ var JetBrainsMonoTTF []byte
 //go:embed JetBrainsMonoNL-Regular.ttf
 var JetBrainsMonoNLTTF []byte
 
-var JetBrainsMono string = base64.StdEncoding.EncodeToString(JetBrainsMonoTTF)
-var JetBrainsMonoNL string = base64.StdEncoding.EncodeToString(JetBrainsMonoNLTTF)
+var (
+	// JetBrainsMono font.
+	JetBrainsMono = base64.StdEncoding.EncodeToString(JetBrainsMonoTTF)
+
+	// JetBrainsMonoNL font.
+	JetBrainsMonoNL = base64.StdEncoding.EncodeToString(JetBrainsMonoNLTTF)
+)

freeze_test.go

@@ -15,8 +15,10 @@ import (
 
 const binary = "./test/freeze-test"
 
-var update = flag.Bool("update", false, "update golden files")
-var png = flag.Bool("png", false, "update pngs")
+var (
+	update = flag.Bool("update", false, "update golden files")
+	png    = flag.Bool("png", false, "update pngs")
+)
 
 func TestMain(m *testing.M) {
 	flag.Parse()
@@ -278,21 +280,26 @@ func TestFreezeConfigurations(t *testing.T) {
 			flags:  []string{},
 			output: "tab",
 		},
+		{
+			input:  "test/input/wrap.go",
+			flags:  []string{"--wrap", "80", "--width", "600"},
+			output: "wrap",
+		},
 	}
 
 	err := os.RemoveAll("test/output/svg")
 	if err != nil {
 		t.Fatal("unable to remove output files")
 	}
-	err = os.MkdirAll("test/output/svg", 0755)
+	err = os.MkdirAll("test/output/svg", 0o755)
 	if err != nil {
 		t.Fatal("unable to create output directory")
 	}
-	err = os.MkdirAll("test/golden/svg", 0755)
+	err = os.MkdirAll("test/golden/svg", 0o755)
 	if err != nil {
 		t.Fatal("unable to create output directory")
 	}
-	err = os.MkdirAll("test/output/png", 0755)
+	err = os.MkdirAll("test/output/png", 0o755)
 	if err != nil {
 		t.Fatal("unable to create output directory")
 	}
@@ -319,7 +326,7 @@ func TestFreezeConfigurations(t *testing.T) {
 			}
 			goldenfile := "test/golden/svg/" + tc.output + ".svg"
 			if *update {
-				if err := os.WriteFile(goldenfile, got, 0644); err != nil {
+				if err := os.WriteFile(goldenfile, got, 0o644); err != nil {
 					t.Log(err)
 					t.Fatal("unexpected error")
 				}