changes for playground update

grantnelson-wf · grantnelson-wf · commit 987be9fd71bd · 2026-01-22T17:17:06.000-07:00
diff --git a/build/build.go b/build/build.go
@@ -31,9 +31,9 @@ import (
 	"github.com/gopherjs/gopherjs/build/cache"
 	"github.com/gopherjs/gopherjs/compiler"
 	"github.com/gopherjs/gopherjs/compiler/astutil"
+	"github.com/gopherjs/gopherjs/compiler/errlist"
 	"github.com/gopherjs/gopherjs/compiler/incjs"
 	"github.com/gopherjs/gopherjs/compiler/sources"
-	"github.com/gopherjs/gopherjs/internal/errlist"
 	"github.com/gopherjs/gopherjs/internal/sourcemapx"
 	"github.com/gopherjs/gopherjs/internal/testmain"
 )
diff --git a/compiler/compiler.go b/compiler/compiler.go
@@ -325,7 +325,7 @@ func WritePkgCode(pkg *Archive, dceSelection map[*Decl]struct{}, gls linkname.Go
 			lines = append(lines, fmt.Sprintf("\t\t\t%s = $linknames[%q];\n", d.RefExpr, impl.String()))
 		}
 		if len(lines) > 0 {
-			if _, err := writeF(w, minify, "\t\t$pkg.$initLinknames = function() {\n%s};\n", strings.Join(lines, "")); err != nil {
+			if _, err := writeF(w, minify, "\t\t$pkg.$initLinknames = function() {\n%s\t\t};\n", strings.Join(lines, "")); err != nil {
 				return err
 			}
 		}
diff --git a/compiler/errlist/errlist.go b/compiler/errlist/errlist.go
diff --git a/compiler/linkname/linkname.go b/compiler/linkname/linkname.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 
 	"github.com/gopherjs/gopherjs/compiler/astutil"
+	"github.com/gopherjs/gopherjs/compiler/errlist"
 	"github.com/gopherjs/gopherjs/compiler/internal/symbol"
-	"github.com/gopherjs/gopherjs/internal/errlist"
 )
 
 // GoLinkname describes a go:linkname compiler directive found in the source code.
diff --git a/compiler/package.go b/compiler/package.go
@@ -9,12 +9,12 @@ import (
 
 	"golang.org/x/tools/go/types/typeutil"
 
+	"github.com/gopherjs/gopherjs/compiler/errlist"
 	"github.com/gopherjs/gopherjs/compiler/internal/analysis"
 	"github.com/gopherjs/gopherjs/compiler/internal/dce"
 	"github.com/gopherjs/gopherjs/compiler/internal/typeparams"
 	"github.com/gopherjs/gopherjs/compiler/sources"
 	"github.com/gopherjs/gopherjs/compiler/typesutil"
-	"github.com/gopherjs/gopherjs/internal/errlist"
 	"github.com/gopherjs/gopherjs/internal/sourcemapx"
 )
 
diff --git a/compiler/prelude/prelude.js b/compiler/prelude/prelude.js
@@ -35,6 +35,19 @@ if (!$global.fs) {
     $global.fs = {
         constants: { O_WRONLY: -1, O_RDWR: -1, O_CREAT: -1, O_TRUNC: -1, O_APPEND: -1, O_EXCL: -1 }, // unused
         writeSync: function writeSync(fd, buf) {
+            // check for a hook to redirect `os.Stdout` and `os.Stderr` to a different output
+            // instead of the default `console.log`. This is useful for redirecting methods like
+            // fmt.Println to write to a text box, like we do for the GopherJS playground.
+            // `fd` is 1 for os.Stdout ("/dev/stdout") and 2 for os.Stderr ("/dev/stderr").
+            // This will not work when running in node.js or another `fs` is present.
+            // This will not effect the built-in `print` methods.
+            if ($global.gopherjsWriteSyncHook) {
+                outputBuf += decoder.decode(buf);
+                $global.gopherjsWriteSyncHook(fd, outputBuf);
+                outputBuf = "";
+                return buf.length;
+            }
+
             outputBuf += decoder.decode(buf);
             var nl = outputBuf.lastIndexOf("\n");
             if (nl != -1) {
diff --git a/compiler/sources/sources.go b/compiler/sources/sources.go
@@ -9,11 +9,11 @@ import (
 
 	"github.com/neelance/astrewrite"
 
+	"github.com/gopherjs/gopherjs/compiler/errlist"
 	"github.com/gopherjs/gopherjs/compiler/incjs"
 	"github.com/gopherjs/gopherjs/compiler/internal/analysis"
 	"github.com/gopherjs/gopherjs/compiler/internal/typeparams"
 	"github.com/gopherjs/gopherjs/compiler/linkname"
-	"github.com/gopherjs/gopherjs/internal/errlist"
 )
 
 // Sources is a slice of parsed Go sources and additional data for a package.
diff --git a/tool.go b/tool.go
@@ -32,8 +32,8 @@ import (
 	gbuild "github.com/gopherjs/gopherjs/build"
 	"github.com/gopherjs/gopherjs/build/cache"
 	"github.com/gopherjs/gopherjs/compiler"
+	"github.com/gopherjs/gopherjs/compiler/errlist"
 	"github.com/gopherjs/gopherjs/compiler/incjs"
-	"github.com/gopherjs/gopherjs/internal/errlist"
 	"github.com/gopherjs/gopherjs/internal/sourcemapx"
 	"github.com/gopherjs/gopherjs/internal/sysutil"
 )

Original file line number	Diff line number	Diff line change
`@@ -325,7 +325,7 @@ func WritePkgCode(pkg Archive, dceSelection map[Decl]struct{}, gls linkname.Go`
`325`	`325`	`lines = append(lines, fmt.Sprintf("\t\t\t%s = $linknames[%q];\n", d.RefExpr, impl.String()))`
`326`	`326`	`}`
`327`	`327`	`if len(lines) > 0 {`
`328`		`- if _, err := writeF(w, minify, "\t\t$pkg.$initLinknames = function() {\n%s};\n", strings.Join(lines, "")); err != nil {`
	`328`	`+ if _, err := writeF(w, minify, "\t\t$pkg.$initLinknames = function() {\n%s\t\t};\n", strings.Join(lines, "")); err != nil {`
`329`	`329`	`return err`
`330`	`330`	`}`
`331`	`331`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`"strings"`
`8`	`8`
`9`	`9`	`"github.com/gopherjs/gopherjs/compiler/astutil"`
	`10`	`+ "github.com/gopherjs/gopherjs/compiler/errlist"`
`10`	`11`	`"github.com/gopherjs/gopherjs/compiler/internal/symbol"`
`11`		`- "github.com/gopherjs/gopherjs/internal/errlist"`
`12`	`12`	`)`
`13`	`13`
`14`	`14`	`// GoLinkname describes a go:linkname compiler directive found in the source code.`