checkGopDeps fix: support qiniu/x

goplus · Feb 18, 2024 · f9fff1b · f9fff1b
1 parent 01d5110
commit f9fff1b
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/modload/module.go b/modload/module.go
@@ -312,6 +312,12 @@ func (p Module) Save() (err error) {
 }
 
 func (p Module) checkGopDeps() (flags int) {
+ switch p.Path() {
+ case gopMod:
+ return FlagDepModGop | FlagDepModX
+ case xMod:
+ return FlagDepModX
+ }
  for _, r := range p.File.Require {
  switch r.Mod.Path {
  case gopMod:
@@ -345,9 +351,6 @@ const (
 // SaveWithGopMod adds `require github.com/goplus/gop` and saves all
 // changes of this module.
 func (p Module) SaveWithGopMod(gop *env.Gop, flags int) (err error) {
- if p.Path() == gopMod { // don't change Go+ itself
- return
- }
  old := p.checkGopDeps()
  if (flags &^ old) == 0 { // nothing to do
  return

diff --git a/modload/module_test.go b/modload/module_test.go
@@ -29,6 +29,18 @@ import (
  "golang.org/x/mod/module"
 )
 
+func TestCheckGopDeps(t *testing.T) {
+ mod := Default
+ file := *mod.File
+ mod.File = &file
+ mod.File.Module = &gomodfile.Module{Mod: module.Version{
+ Path: "github.com/qiniu/x",
+ }}
+ if mod.checkGopDeps() != FlagDepModX {
+ t.Fatal("checkGopDeps")
+ }
+}
+
 func TestEmpty(t *testing.T) {
  mod := &Module{File: new(gomodfile.File), Opt: new(modfile.File)}
  if mod.HasModfile() {