Merge pull request #2287 from goplus/main

rm dep of golang.org/x/tools

Author: xushiwei

.github/workflows/go.yml

@@ -29,7 +29,7 @@ jobs:
         - 1.19.x
         - 1.21.x
         - 1.22.x
-        - 1.23.x
+        - 1.24.x
     runs-on: ${{ matrix.os }}
     steps:
     - uses: actions/checkout@v4
@@ -72,11 +72,6 @@ jobs:
       with:
         go-version: ${{ matrix.go }}
 
-    - name: Update golang.org/x/tools
-      run: |
-        go work init .
-        go work edit -replace golang.org/x/tools=golang.org/x/[email protected]
-
     - name: Test Go+ installer
       run: |
         git config --global user.email "[email protected]"

cl/outline/outline.go

@@ -21,11 +21,11 @@ import (
 	"strings"
 
 	"github.com/goplus/gogen"
+	"github.com/goplus/gogen/typeutil"
 	"github.com/goplus/gop/ast"
 	"github.com/goplus/gop/cl"
 	"github.com/goplus/gop/token"
 	"github.com/goplus/mod/modfile"
-	"golang.org/x/tools/go/types/typeutil"
 )
 
 // -----------------------------------------------------------------------------

cmd/make.go

@@ -351,13 +351,6 @@ func buildGoplusTools(useGoProxy bool) {
 		log.Fatalln(err)
 	}
 
-	switch goVersion() {
-	case "1.24":
-		work := filepath.Join(commandsDir, "_make", "1.24", "go.work")
-		commandExecuteEnv = append(commandExecuteEnv,
-			"GOWORK="+work)
-	}
-
 	println("Building Go+ tools...\n")
 	os.Chdir(commandsDir)
 	buildOutput, err := execCommand("go", "build", "-o", gopBinPath, "-v", "-ldflags", buildFlags, "./...")
@@ -372,12 +365,6 @@ func buildGoplusTools(useGoProxy bool) {
 	println("\nGo+ tools built successfully!")
 }
 
-var (
-	workfile = `use ./..
-replace golang.org/x/tools => golang.org/x/tools v0.30
-`
-)
-
 func goVersion() string {
 	out, err := execCommand("go", "version")
 	if err != nil {

go.mod

@@ -4,11 +4,10 @@ go 1.18
 
 require (
 	github.com/fsnotify/fsnotify v1.9.0
-	github.com/goplus/gogen v1.16.9
+	github.com/goplus/gogen v1.17.1
 	github.com/goplus/llgo v0.10.1
-	github.com/goplus/mod v0.15.0
+	github.com/goplus/mod v0.15.1
 	github.com/qiniu/x v1.13.17
-	golang.org/x/tools v0.19.0
 )
 
 require (

go.sum

@@ -1,17 +1,14 @@
 github.com/fsnotify/fsnotify v1.9.0 h1:2Ml+OJNzbYCTzsxtv8vKSFD9PbJjmhYF14k/jKC7S9k=
 github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
-github.com/goplus/gogen v1.16.9 h1:BRNAsRzdyMcLBOLUe6+suVMmOe+D2HLfF7mAkS4/QW4=
-github.com/goplus/gogen v1.16.9/go.mod h1:6TQYbabXDF9LCdDkOOzHmfg1R4ENfXQ3XpHa9RhTSD8=
+github.com/goplus/gogen v1.17.1 h1:dx1KoggI3jK0ti4GyQAJMPAib81BP2uePA8xQ9dMJlU=
+github.com/goplus/gogen v1.17.1/go.mod h1:owX2e1EyU5WD+Nm6oH2m/GXjLdlBYcwkLO4wN8HHXZI=
 github.com/goplus/llgo v0.10.1 h1:Cla7Rv6S67SnAknMm8nNvHhxFf9Fo/daHRcs3w3rS6s=
 github.com/goplus/llgo v0.10.1/go.mod h1:YfOHsT/g3lc9b4GclLj812YzdSsJr0kd3CCB830TqHE=
-github.com/goplus/mod v0.15.0 h1:EPQVii2PpEq6JRfHw9zxEu1/aoJbzSDTSQO5nNPsBDA=
-github.com/goplus/mod v0.15.0/go.mod h1:TaeZAljI1qWHNh27w5lSLIhhMvPSihr6sQu7Lnp/2aE=
+github.com/goplus/mod v0.15.1 h1:kNSnM5ZIpZbZmySzv/oqK9uJF5RCxRvcLsxjDMOxWVw=
+github.com/goplus/mod v0.15.1/go.mod h1:ww47rwm4lzsqZN8Oz5jH8wt/KsQclltMe45DelLJmSA=
 github.com/qiniu/x v1.13.17 h1:x5GJNg3rN2PagEZ5JvXmusoIaK1iaGGppFK41i0VAis=
 github.com/qiniu/x v1.13.17/go.mod h1:AiovSOCaRijaf3fj+0CBOpR1457pn24b0Vdb1JpwhII=
 golang.org/x/mod v0.20.0 h1:utOm6MM3R3dnawAiJgn0y+xvuYRsm1RKM/4giyfDgV0=
 golang.org/x/mod v0.20.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
-golang.org/x/sync v0.6.0 h1:5BMeUDZ7vkXGfEr1x9B4bRcTH4lpkTkpdh0T/J+qjbQ=
 golang.org/x/sys v0.21.0 h1:rF+pYz3DAGSQAxAu1CbC7catZg4ebC4UIeIhKxBZvws=
 golang.org/x/sys v0.21.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
-golang.org/x/tools v0.19.0 h1:tfGCXNR1OsFG+sVdLAitlpjAvD/I6dHDKnYrpEZUHkw=
-golang.org/x/tools v0.19.0/go.mod h1:qoJWxmGSIBmAeriMx19ogtrEPrGtDbPK634QFIcLAhc=