Skip to content

Commit d61e471

Browse files
authored
Update dependencies (#1785)
1 parent 4fb58be commit d61e471

File tree

10 files changed

+681
-704
lines changed

10 files changed

+681
-704
lines changed

.custom-gcl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# yaml-language-server: $schema=https://golangci-lint.run/jsonschema/custom-gcl.jsonschema.json
22

3-
version: v2.4.0
3+
version: v2.5.0
44

55
destination: ./_tools
66

NOTICE.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
221221

222222
---------------------------------------------------------
223223

224-
github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b - BSD-3-Clause
224+
github.com/go-json-experiment/json v0.0.0-20250910080747-cc2cfa0554c3 - BSD-3-Clause
225225

226226

227227
Copyright 2010 The Go Authors

_extension/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
},
107107
"devDependencies": {
108108
"@types/vscode": "^1.100.0",
109-
"@vscode/vsce": "^3.6.0",
110-
"esbuild": "^0.25.8"
109+
"@vscode/vsce": "^3.6.2",
110+
"esbuild": "^0.25.10"
111111
}
112112
}

_tools/go.mod

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ go 1.25
55
require (
66
github.com/golangci/plugin-module-register v0.1.2
77
golang.org/x/mod v0.28.0
8-
golang.org/x/tools v0.36.0
8+
golang.org/x/tools v0.37.0
99
gotest.tools/v3 v3.5.2
1010
)
1111

1212
require (
1313
github.com/google/go-cmp v0.6.0 // indirect
14-
golang.org/x/sync v0.16.0 // indirect
14+
golang.org/x/sync v0.17.0 // indirect
1515
)

_tools/go.sum

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
44
github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
55
golang.org/x/mod v0.28.0 h1:gQBtGhjxykdjY9YhZpSlZIsbnaE2+PgjfLWUQTnoZ1U=
66
golang.org/x/mod v0.28.0/go.mod h1:yfB/L0NOf/kmEbXjzCPOx1iK1fRutOydrCMsqRhEBxI=
7-
golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw=
8-
golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
9-
golang.org/x/tools v0.36.0 h1:kWS0uv/zsvHEle1LbV5LE8QujrxB3wfQyxHfhOk0Qkg=
10-
golang.org/x/tools v0.36.0/go.mod h1:WBDiHKJK8YgLHlcQPYQzNCkUxUypCaa5ZegCVutKm+s=
7+
golang.org/x/sync v0.17.0 h1:l60nONMj9l5drqw6jlhIELNv9I0A4OFgRsG9k2oT9Ug=
8+
golang.org/x/sync v0.17.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
9+
golang.org/x/tools v0.37.0 h1:DVSRzp7FwePZW356yEAChSdNcQo6Nsp+fex1SUW09lE=
10+
golang.org/x/tools v0.37.0/go.mod h1:MBN5QPQtLMHVdvsbtarmTNukZDdgwdwlO5qGacAzF0w=
1111
gotest.tools/v3 v3.5.2 h1:7koQfIKdy+I8UTetycgUqXWSDwpgv193Ka+qRsmBY8Q=
1212
gotest.tools/v3 v3.5.2/go.mod h1:LtdLGcnqToBH83WByAAi/wiwSFCArdFIUV/xxN4pcjA=

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.25
44

55
require (
66
github.com/dlclark/regexp2 v1.11.5
7-
github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b
7+
github.com/go-json-experiment/json v0.0.0-20250910080747-cc2cfa0554c3
88
github.com/google/go-cmp v0.7.0
99
github.com/peter-evans/patience v0.3.0
1010
github.com/zeebo/xxh3 v1.0.2

go.sum

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
22
github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
3-
github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b h1:6Q4zRHXS/YLOl9Ng1b1OOOBWMidAQZR3Gel0UKPC/KU=
4-
github.com/go-json-experiment/json v0.0.0-20250813233538-9b1f9ea2e11b/go.mod h1:TiCD2a1pcmjd7YnhGH0f/zKNcCD06B029pHhzV23c2M=
3+
github.com/go-json-experiment/json v0.0.0-20250910080747-cc2cfa0554c3 h1:02WINGfSX5w0Mn+F28UyRoSt9uvMhKguwWMlOAh6U/0=
4+
github.com/go-json-experiment/json v0.0.0-20250910080747-cc2cfa0554c3/go.mod h1:uNVvRXArCGbZ508SxYYTC5v1JWoz2voff5pm25jU1Ok=
55
github.com/go-quicktest/qt v1.101.0 h1:O1K29Txy5P2OK0dGo59b7b0LR6wKfIhttaAhHUyn7eI=
66
github.com/go-quicktest/qt v1.101.0/go.mod h1:14Bz/f7NwaXPtdYEgzsx46kqSxVwTbzVZsDC26tQJow=
77
github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=

internal/testutil/harnessutil/sourcemap_recorder.go

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,16 @@ type writerAggregator struct {
1616
strings.Builder
1717
}
1818

19-
func (w *writerAggregator) WriteStringF(format string, args ...any) {
19+
func (w *writerAggregator) WriteStringf(format string, args ...any) {
2020
w.WriteString(fmt.Sprintf(format, args...))
2121
}
2222

2323
func (w *writerAggregator) WriteLine(s string) {
2424
w.WriteString(s + "\r\n")
2525
}
2626

27-
func (w *writerAggregator) WriteLineF(format string, args ...any) {
28-
w.WriteStringF(format+"\r\n", args...)
27+
func (w *writerAggregator) WriteLinef(format string, args ...any) {
28+
w.WriteStringf(format+"\r\n", args...)
2929
}
3030

3131
type sourceMapSpanWithDecodeErrors struct {
@@ -103,31 +103,31 @@ func newSourceMapSpanWriter(sourceMapRecorder *writerAggregator, sourceMap *sour
103103
}
104104

105105
sourceMapRecorder.WriteLine("===================================================================")
106-
sourceMapRecorder.WriteLineF("JsFile: %s", sourceMap.File)
107-
sourceMapRecorder.WriteLineF("mapUrl: %s", sourcemap.TryGetSourceMappingURL(sourcemap.CreateECMALineInfo(jsFile.Content, writer.jsLineMap)))
108-
sourceMapRecorder.WriteLineF("sourceRoot: %s", sourceMap.SourceRoot)
109-
sourceMapRecorder.WriteLineF("sources: %s", strings.Join(sourceMap.Sources, ","))
106+
sourceMapRecorder.WriteLinef("JsFile: %s", sourceMap.File)
107+
sourceMapRecorder.WriteLinef("mapUrl: %s", sourcemap.TryGetSourceMappingURL(sourcemap.CreateECMALineInfo(jsFile.Content, writer.jsLineMap)))
108+
sourceMapRecorder.WriteLinef("sourceRoot: %s", sourceMap.SourceRoot)
109+
sourceMapRecorder.WriteLinef("sources: %s", strings.Join(sourceMap.Sources, ","))
110110
if len(sourceMap.SourcesContent) > 0 {
111111
content, err := json.Marshal(sourceMap.SourcesContent)
112112
if err != nil {
113113
panic(err)
114114
}
115-
sourceMapRecorder.WriteLineF("sourcesContent: %s", content)
115+
sourceMapRecorder.WriteLinef("sourcesContent: %s", content)
116116
}
117117
sourceMapRecorder.WriteLine("===================================================================")
118118
return writer
119119
}
120120

121121
func (w *sourceMapSpanWriter) getSourceMapSpanString(mapEntry *sourcemap.Mapping, getAbsentNameIndex bool) string {
122122
var mapString writerAggregator
123-
mapString.WriteStringF("Emitted(%d, %d)", mapEntry.GeneratedLine+1, mapEntry.GeneratedCharacter+1)
123+
mapString.WriteStringf("Emitted(%d, %d)", mapEntry.GeneratedLine+1, mapEntry.GeneratedCharacter+1)
124124
if mapEntry.IsSourceMapping() {
125-
mapString.WriteStringF(" Source(%d, %d) + SourceIndex(%d)", mapEntry.SourceLine+1, mapEntry.SourceCharacter+1, mapEntry.SourceIndex)
125+
mapString.WriteStringf(" Source(%d, %d) + SourceIndex(%d)", mapEntry.SourceLine+1, mapEntry.SourceCharacter+1, mapEntry.SourceIndex)
126126
if mapEntry.NameIndex >= 0 && int(mapEntry.NameIndex) < len(w.sourceMapNames) {
127-
mapString.WriteStringF(" name (%s)", w.sourceMapNames[mapEntry.NameIndex])
127+
mapString.WriteStringf(" name (%s)", w.sourceMapNames[mapEntry.NameIndex])
128128
} else {
129129
if mapEntry.NameIndex != sourcemap.MissingName || getAbsentNameIndex {
130-
mapString.WriteStringF(" nameIndex (%d)", mapEntry.NameIndex)
130+
mapString.WriteStringf(" nameIndex (%d)", mapEntry.NameIndex)
131131
}
132132
}
133133
}
@@ -180,11 +180,11 @@ func (w *sourceMapSpanWriter) recordNewSourceFileSpan(sourceMapSpan *sourcemap.M
180180

181181
w.sourceMapRecorder.WriteLine("-------------------------------------------------------------------")
182182
if continuesLine {
183-
w.sourceMapRecorder.WriteLineF("emittedFile:%s (%d, %d)", w.jsFile.UnitName, sourceMapSpan.GeneratedLine+1, sourceMapSpan.GeneratedCharacter+1)
183+
w.sourceMapRecorder.WriteLinef("emittedFile:%s (%d, %d)", w.jsFile.UnitName, sourceMapSpan.GeneratedLine+1, sourceMapSpan.GeneratedCharacter+1)
184184
} else {
185-
w.sourceMapRecorder.WriteLineF("emittedFile:%s", w.jsFile.UnitName)
185+
w.sourceMapRecorder.WriteLinef("emittedFile:%s", w.jsFile.UnitName)
186186
}
187-
w.sourceMapRecorder.WriteLineF("sourceFile:%s", w.sourceMapSources[w.spansOnSingleLine[0].sourceMapSpan.SourceIndex])
187+
w.sourceMapRecorder.WriteLinef("sourceFile:%s", w.sourceMapSources[w.spansOnSingleLine[0].sourceMapSpan.SourceIndex])
188188
w.sourceMapRecorder.WriteLine("-------------------------------------------------------------------")
189189

190190
w.tsLineMap = core.ComputeECMALineStarts(newSourceFileCode)
@@ -198,7 +198,7 @@ func (w *sourceMapSpanWriter) close() {
198198

199199
if !w.sourceMapDecoder.hasCompletedDecoding() {
200200
w.sourceMapRecorder.WriteLine("!!!! **** There are more source map entries in the sourceMap's mapping than what was encoded")
201-
w.sourceMapRecorder.WriteLineF("!!!! **** Remaining decoded string: %s", w.sourceMapDecoder.getRemainingDecodeString())
201+
w.sourceMapRecorder.WriteLinef("!!!! **** Remaining decoded string: %s", w.sourceMapDecoder.getRemainingDecodeString())
202202
}
203203

204204
// write remaining js lines
@@ -223,7 +223,7 @@ func (w *sourceMapSpanWriter) getTextOfLine(line int, lineMap []core.TextPos, co
223223

224224
func (w *sourceMapSpanWriter) writeJsFileLines(endJsLine int) {
225225
for ; w.nextJsLineToWrite < endJsLine; w.nextJsLineToWrite++ {
226-
w.sourceMapRecorder.WriteStringF(">>>%s", w.getTextOfLine(w.nextJsLineToWrite, w.jsLineMap, w.jsFile.Content))
226+
w.sourceMapRecorder.WriteStringf(">>>%s", w.getTextOfLine(w.nextJsLineToWrite, w.jsLineMap, w.jsFile.Content))
227227
}
228228
}
229229

@@ -319,7 +319,7 @@ func (sw *recordedSpanWriter) writeSourceMapSourceText(currentSpan *sourceMapSpa
319319
}
320320

321321
func (sw *recordedSpanWriter) writeSpanDetails(currentSpan *sourceMapSpanWithDecodeErrors, index int) {
322-
sw.w.sourceMapRecorder.WriteLineF("%s%s", sw.markerIds[index], sw.w.getSourceMapSpanString(currentSpan.sourceMapSpan, false /*getAbsentNameIndex*/))
322+
sw.w.sourceMapRecorder.WriteLinef("%s%s", sw.markerIds[index], sw.w.getSourceMapSpanString(currentSpan.sourceMapSpan, false /*getAbsentNameIndex*/))
323323
}
324324

325325
func (sw *recordedSpanWriter) writeRecordedSpans() {

0 commit comments

Comments
 (0)