Skip to content

Commit

Permalink
chore: fix linting
Browse files Browse the repository at this point in the history
  • Loading branch information
Vilsol committed Jul 24, 2024
1 parent 279ecf3 commit 18ef2ed
Show file tree
Hide file tree
Showing 12 changed files with 153 additions and 42 deletions.
2 changes: 0 additions & 2 deletions .github/workflows/push.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,6 @@ jobs:

- uses: golangci/golangci-lint-action@v6
with:
skip-pkg-cache: true
skip-build-cache: true
args: --timeout 5m

lint-frontend:
Expand Down
67 changes: 62 additions & 5 deletions .golangci.yml
Original file line number Diff line number Diff line change
@@ -1,30 +1,87 @@
linters-settings:
wrapcheck:
ignoreSigs:
- .Errorf(
- errors.New(
- errors.Unwrap(
- .WithMessage(
- .WithMessagef(
- .WithStack(
- github.com/labstack/echo/v4.Context

ignorePackageGlobs:
- github.com/vilsol/timeless-jewels/*

govet:
disable:
- shadow

gocritic:
disabled-checks:
- ifElseChain

gci:
custom-order: true
sections:
- standard
- default
- prefix(github.com/vilsol/timeless-jewels)
- blank
- dot

sloglint:
attr-only: true
context: scope
forbidden-keys:
- time
- level
- msg
- source

spancheck:
checks:
- end
- record-error
- set-status


issues:
exclude-files:
- ./generated/generated.go
- ./generated/models_gen.go
exclude-dirs:
- ./generated/
exclude:
- should pass the context parameter

linters:
disable-all: true
enable:
- deadcode
- errcheck
- gosimple
- govet
- ineffassign
- staticcheck
- structcheck
- typecheck
- unused
- varcheck
- bidichk
- contextcheck
- durationcheck
- errorlint
- goconst
- goimports
- revive
- ifshort
- misspell
- prealloc
- whitespace
- wrapcheck
- gci
- gocritic
- gofumpt
- nonamedreturns
- inamedparam
- sloglint
- spancheck
- intrange
- copyloopvar
- fatcontext
- canonicalheader
6 changes: 3 additions & 3 deletions calculator/tree_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ func (a *AlternateTreeManager) ReplacePassiveSkill(rng *random.NumberGenerator)

elements := min(uint32(len(rolledAlternatePassiveSkill.StatsKeys)), 4)
alternatePassiveSkillStatRolls := make(map[uint32]uint32, elements)
for i := uint32(0); i < elements; i++ {
for i := range elements {
alternatePassiveSkillStatRolls[i] = rolledAlternatePassiveSkill.GetStatMinMax(true, i)

if rolledAlternatePassiveSkill.GetStatMinMax(false, i) > rolledAlternatePassiveSkill.GetStatMinMax(true, i) {
Expand Down Expand Up @@ -130,7 +130,7 @@ func (a *AlternateTreeManager) RollAdditions(minimumAdditions uint32, maximumAdd

alternatePassiveAdditionInformations := make([]data.AlternatePassiveAdditionInformation, 0)

for i := uint32(0); i < additionCountRoll; i++ {
for range additionCountRoll {
var rolledAlternatePassiveAddition *data.AlternatePassiveAddition

for rolledAlternatePassiveAddition == nil {
Expand All @@ -139,7 +139,7 @@ func (a *AlternateTreeManager) RollAdditions(minimumAdditions uint32, maximumAdd

elements := min(uint32(len(rolledAlternatePassiveAddition.StatsKeys)), 2)
alternatePassiveAdditionStatRolls := make(map[uint32]uint32, elements)
for j := uint32(0); j < elements; j++ {
for j := range elements {
alternatePassiveAdditionStatRolls[j] = rolledAlternatePassiveAddition.GetStatMinMax(true, j)

if rolledAlternatePassiveAddition.GetStatMinMax(false, j) > rolledAlternatePassiveAddition.GetStatMinMax(true, j) {
Expand Down
24 changes: 16 additions & 8 deletions data/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,24 +3,29 @@ package data
import (
"bytes"
"compress/gzip"
_ "embed"
"encoding/json"
"io"

_ "embed"
)

//go:embed alternate_passive_additions.json.gz
var alternatePassiveAdditionsGz []byte
var AlternatePassiveAdditions []*AlternatePassiveAddition

var idToAlternatePassiveAddition = make(map[uint32]*AlternatePassiveAddition)
var reverseAlternatePassiveAdditions = make(map[PassiveSkillType]map[uint32][]*AlternatePassiveAddition)
var (
idToAlternatePassiveAddition = make(map[uint32]*AlternatePassiveAddition)
reverseAlternatePassiveAdditions = make(map[PassiveSkillType]map[uint32][]*AlternatePassiveAddition)
)

//go:embed alternate_passive_skills.json.gz
var alternatePassiveSkillsGz []byte
var AlternatePassiveSkills []*AlternatePassiveSkill

var idToAlternatePassiveSkill = make(map[uint32]*AlternatePassiveSkill)
var reverseAlternatePassiveSkills = make(map[PassiveSkillType]map[uint32][]*AlternatePassiveSkill)
var (
idToAlternatePassiveSkill = make(map[uint32]*AlternatePassiveSkill)
reverseAlternatePassiveSkills = make(map[PassiveSkillType]map[uint32][]*AlternatePassiveSkill)
)

//go:embed alternate_tree_versions.json.gz
var alternateTreeVersionsGz []byte
Expand All @@ -42,8 +47,11 @@ var idToStat = make(map[uint32]*Stat)

//go:embed SkillTree.json.gz
var skillTreeGz []byte
var SkillTreeJSON []byte
var SkillTreeData SkillTree

var (
SkillTreeJSON []byte
SkillTreeData SkillTree
)

//go:embed stat_descriptions.json.gz
var statTranslationsGz []byte
Expand Down Expand Up @@ -124,7 +132,7 @@ func init() {
}

func unzipJSONTo[T any](data []byte) T {
var out = new(T)
out := new(T)
if err := json.Unmarshal(unzipTo(data), &out); err != nil {
panic(err)
}
Expand Down
3 changes: 2 additions & 1 deletion devbox.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
{
"packages": [
"[email protected]",
"[email protected]"
"[email protected]",
"[email protected]"
],
"env": {
"DEVBOX_COREPACK_ENABLED": "true"
Expand Down
78 changes: 63 additions & 15 deletions devbox.lock
Original file line number Diff line number Diff line change
Expand Up @@ -49,68 +49,116 @@
}
}
},
"[email protected]": {
"[email protected]": {
"last_modified": "2024-07-07T07:43:47Z",
"resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#golangci-lint",
"source": "devbox-search",
"version": "1.59.1",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/80cn62vqs99adkpvjv5qmv9nvkahcy0s-golangci-lint-1.59.1",
"default": true
}
],
"store_path": "/nix/store/80cn62vqs99adkpvjv5qmv9nvkahcy0s-golangci-lint-1.59.1"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/f91hm1xlmjy5y18lavfn9889azxam4mp-golangci-lint-1.59.1",
"default": true
}
],
"store_path": "/nix/store/f91hm1xlmjy5y18lavfn9889azxam4mp-golangci-lint-1.59.1"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/pn0lpm53xffqvdfd72n4mfn8ja4kmf1h-golangci-lint-1.59.1",
"default": true
}
],
"store_path": "/nix/store/pn0lpm53xffqvdfd72n4mfn8ja4kmf1h-golangci-lint-1.59.1"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/fx4p42sdx70hzpzsl71r5zwh8az0p74a-golangci-lint-1.59.1",
"default": true
}
],
"store_path": "/nix/store/fx4p42sdx70hzpzsl71r5zwh8az0p74a-golangci-lint-1.59.1"
}
}
},
"[email protected]": {
"last_modified": "2024-07-07T07:43:47Z",
"plugin_version": "0.0.2",
"resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#nodejs_18",
"resolved": "github:NixOS/nixpkgs/b60793b86201040d9dee019a05089a9150d08b5b#nodejs_22",
"source": "devbox-search",
"version": "18.20.2",
"version": "22.3.0",
"systems": {
"aarch64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/2n9c55cd1376ajbrfcc3bpicdh82hglb-nodejs-18.20.2",
"path": "/nix/store/cpqfn567chsy7mslcfwnijsn6mq82lcq-nodejs-22.3.0",
"default": true
},
{
"name": "libv8",
"path": "/nix/store/ymf7b294cf6hvw8dcs4km4z7w7vwx8y9-nodejs-18.20.2-libv8"
"path": "/nix/store/mfjmdqb1sxxm7r4d4px5r3p6m378kzy5-nodejs-22.3.0-libv8"
}
],
"store_path": "/nix/store/2n9c55cd1376ajbrfcc3bpicdh82hglb-nodejs-18.20.2"
"store_path": "/nix/store/cpqfn567chsy7mslcfwnijsn6mq82lcq-nodejs-22.3.0"
},
"aarch64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/y6pr2gldc02pk6ghm1fapbsvhhjf2kpa-nodejs-18.20.2",
"path": "/nix/store/q7cgrvb6clq0pdp5hlwmq2lldzkl3fmj-nodejs-22.3.0",
"default": true
},
{
"name": "libv8",
"path": "/nix/store/dzllw2vxgsr8s4m2lng602q8p0nq0cnf-nodejs-18.20.2-libv8"
"path": "/nix/store/5df5695winsxzf80q6z0m35zy3p60yw1-nodejs-22.3.0-libv8"
}
],
"store_path": "/nix/store/y6pr2gldc02pk6ghm1fapbsvhhjf2kpa-nodejs-18.20.2"
"store_path": "/nix/store/q7cgrvb6clq0pdp5hlwmq2lldzkl3fmj-nodejs-22.3.0"
},
"x86_64-darwin": {
"outputs": [
{
"name": "out",
"path": "/nix/store/qpg8a1hsz2jihxy0by0wq5p6wjk22fyg-nodejs-18.20.2",
"path": "/nix/store/hd619h1mh6lcmv2kw6nij9xa0zf7ybmr-nodejs-22.3.0",
"default": true
},
{
"name": "libv8",
"path": "/nix/store/is0y2rgkf3mfvfg20r9ya12515yss9dm-nodejs-18.20.2-libv8"
"path": "/nix/store/mipa00s8bq87h3p3allndvg43cpggz3w-nodejs-22.3.0-libv8"
}
],
"store_path": "/nix/store/qpg8a1hsz2jihxy0by0wq5p6wjk22fyg-nodejs-18.20.2"
"store_path": "/nix/store/hd619h1mh6lcmv2kw6nij9xa0zf7ybmr-nodejs-22.3.0"
},
"x86_64-linux": {
"outputs": [
{
"name": "out",
"path": "/nix/store/kr6p8nmj3y4wmfm3q6f0j8yd2zb2lxaj-nodejs-18.20.2",
"path": "/nix/store/bmvx7ww7qfksjqsckmivkg3mqvjscfh8-nodejs-22.3.0",
"default": true
},
{
"name": "libv8",
"path": "/nix/store/3f2q1pvz9s2sqdk4z7k9wq88rk8vrscd-nodejs-18.20.2-libv8"
"path": "/nix/store/w28gijyq24mmk1676gpbxw2xrkysxx1i-nodejs-22.3.0-libv8"
}
],
"store_path": "/nix/store/kr6p8nmj3y4wmfm3q6f0j8yd2zb2lxaj-nodejs-18.20.2"
"store_path": "/nix/store/bmvx7ww7qfksjqsckmivkg3mqvjscfh8-nodejs-22.3.0"
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion frontend/.prettierignore
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ node_modules
pnpm-lock.yaml
package-lock.json
yarn.lock
src/lib/types/*
src/lib/types/*
src/wasm_exec.js
3 changes: 2 additions & 1 deletion frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,5 +37,6 @@
"typescript": "^5.2.2",
"vite": "^4.4.9"
},
"type": "module"
"type": "module",
"packageManager": "[email protected]+sha1.09ada6cd05003e0ced25fb716f9fda4063ec2e3b"
}
1 change: 0 additions & 1 deletion jewel_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ import (
"testing"

"github.com/MarvinJWendt/testza"

"github.com/Vilsol/timeless-jewels/calculator"
"github.com/Vilsol/timeless-jewels/data"
)
Expand Down
6 changes: 3 additions & 3 deletions random/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ func (g *NumberGenerator) Initialize(seeds []uint32) {
index = (index + 1) % 4
}

for i := 0; i < 5; i++ {
for range 5 {
roundState := ManipulateAlpha(
g.state[(index%4)] ^
g.state[((index+1)%4)] ^
Expand All @@ -72,7 +72,7 @@ func (g *NumberGenerator) Initialize(seeds []uint32) {
index = (index + 1) % 4
}

for i := 0; i < 4; i++ {
for range 4 {
roundState := ManipulateBravo(
g.state[(index%4)] +
g.state[((index+1)%4)] +
Expand All @@ -88,7 +88,7 @@ func (g *NumberGenerator) Initialize(seeds []uint32) {
index = (index + 1) % 4
}

for i := 0; i < 8; i++ {
for range 8 {
g.GenerateNextState()
}
}
Expand Down
1 change: 0 additions & 1 deletion reverse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ import (
"testing"

"github.com/MarvinJWendt/testza"

"github.com/Vilsol/timeless-jewels/calculator"
"github.com/Vilsol/timeless-jewels/data"
)
Expand Down
1 change: 0 additions & 1 deletion wasm/exposition/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ package exposition

import (
"github.com/Vilsol/crystalline"

"github.com/Vilsol/timeless-jewels/calculator"
"github.com/Vilsol/timeless-jewels/data"
)
Expand Down

0 comments on commit 18ef2ed

Please sign in to comment.