Go: Include ModMode in GoWorkspace

mbg · mbg · commit 8b376e7a35b0 · 2024-02-14T19:12:28.000Z
diff --git a/go/extractor/project/project.go b/go/extractor/project/project.go
@@ -43,6 +43,7 @@ type GoWorkspace struct {
 	WorkspaceFile *modfile.WorkFile       // The `go.work` file for this workspace
 	Modules       []*GoModule             // A list of `go.mod` files
 	DepMode       DependencyInstallerMode // A value indicating how to install dependencies for this workspace
+	ModMode       ModMode                 // A value indicating which module mode to use for this workspace
 }
 
 // Represents a nullable version string.
@@ -154,6 +155,7 @@ func discoverWorkspace(workFilePath string) GoWorkspace {
 			BaseDir: baseDir,
 			Modules: loadGoModules(findGoModFiles(baseDir)),
 			DepMode: GoGetWithModules,
+			ModMode: getModMode(GoGetWithModules, baseDir),
 		}
 	}
 
@@ -166,6 +168,7 @@ func discoverWorkspace(workFilePath string) GoWorkspace {
 			BaseDir: baseDir,
 			Modules: loadGoModules(findGoModFiles(baseDir)),
 			DepMode: GoGetWithModules,
+			ModMode: getModMode(GoGetWithModules, baseDir),
 		}
 	}
 
@@ -188,6 +191,7 @@ func discoverWorkspace(workFilePath string) GoWorkspace {
 		WorkspaceFile: workFile,
 		Modules:       loadGoModules(goModFilePaths),
 		DepMode:       GoGetWithModules,
+		ModMode:       getModMode(GoGetWithModules, baseDir),
 	}
 }
 
@@ -210,6 +214,7 @@ func discoverWorkspaces(emitDiagnostics bool) []GoWorkspace {
 				BaseDir: filepath.Dir(goModFile),
 				Modules: loadGoModules([]string{goModFile}),
 				DepMode: GoGetWithModules,
+				ModMode: getModMode(GoGetWithModules, filepath.Dir(goModFile)),
 			}
 		}
 
@@ -251,6 +256,7 @@ func getBuildRoots(emitDiagnostics bool) (goWorkspaces []GoWorkspace, totalModul
 		goWorkspaces = []GoWorkspace{{
 			BaseDir: ".",
 			DepMode: GoGetWithModules,
+			ModMode: getModMode(GoGetWithModules, "."),
 		}}
 		totalModuleFiles = 1
 		return
@@ -276,6 +282,7 @@ func getBuildRoots(emitDiagnostics bool) (goWorkspaces []GoWorkspace, totalModul
 		goWorkspaces = []GoWorkspace{{
 			BaseDir: ".",
 			DepMode: GoGetNoModules,
+			ModMode: ModUnset,
 		}}
 		totalModuleFiles = 0
 		return
@@ -328,6 +335,7 @@ func getDepMode(emitDiagnostics bool) []GoWorkspace {
 		return []GoWorkspace{{
 			BaseDir: ".",
 			DepMode: Dep,
+			ModMode: ModUnset,
 		}}
 	}
 
@@ -339,6 +347,7 @@ func getDepMode(emitDiagnostics bool) []GoWorkspace {
 		return []GoWorkspace{{
 			BaseDir: ".",
 			DepMode: Glide,
+			ModMode: ModUnset,
 		}}
 	}
 	return goWorkspaces

Original file line number	Diff line number	Diff line change
`@@ -43,6 +43,7 @@ type GoWorkspace struct {`
`43`	`43`	WorkspaceFile *modfile.WorkFile // The `go.work` file for this workspace
`44`	`44`	Modules []*GoModule // A list of `go.mod` files
`45`	`45`	`DepMode DependencyInstallerMode // A value indicating how to install dependencies for this workspace`
	`46`	`+ ModMode ModMode // A value indicating which module mode to use for this workspace`
`46`	`47`	`}`
`47`	`48`
`48`	`49`	`// Represents a nullable version string.`
`@@ -154,6 +155,7 @@ func discoverWorkspace(workFilePath string) GoWorkspace {`
`154`	`155`	`BaseDir: baseDir,`
`155`	`156`	`Modules: loadGoModules(findGoModFiles(baseDir)),`
`156`	`157`	`DepMode: GoGetWithModules,`
	`158`	`+ ModMode: getModMode(GoGetWithModules, baseDir),`
`157`	`159`	`}`
`158`	`160`	`}`
`159`	`161`
`@@ -166,6 +168,7 @@ func discoverWorkspace(workFilePath string) GoWorkspace {`
`166`	`168`	`BaseDir: baseDir,`
`167`	`169`	`Modules: loadGoModules(findGoModFiles(baseDir)),`
`168`	`170`	`DepMode: GoGetWithModules,`
	`171`	`+ ModMode: getModMode(GoGetWithModules, baseDir),`
`169`	`172`	`}`
`170`	`173`	`}`
`171`	`174`
`@@ -188,6 +191,7 @@ func discoverWorkspace(workFilePath string) GoWorkspace {`
`188`	`191`	`WorkspaceFile: workFile,`
`189`	`192`	`Modules: loadGoModules(goModFilePaths),`
`190`	`193`	`DepMode: GoGetWithModules,`
	`194`	`+ ModMode: getModMode(GoGetWithModules, baseDir),`
`191`	`195`	`}`
`192`	`196`	`}`
`193`	`197`
`@@ -210,6 +214,7 @@ func discoverWorkspaces(emitDiagnostics bool) []GoWorkspace {`
`210`	`214`	`BaseDir: filepath.Dir(goModFile),`
`211`	`215`	`Modules: loadGoModules([]string{goModFile}),`
`212`	`216`	`DepMode: GoGetWithModules,`
	`217`	`+ ModMode: getModMode(GoGetWithModules, filepath.Dir(goModFile)),`
`213`	`218`	`}`
`214`	`219`	`}`
`215`	`220`
`@@ -251,6 +256,7 @@ func getBuildRoots(emitDiagnostics bool) (goWorkspaces []GoWorkspace, totalModul`
`251`	`256`	`goWorkspaces = []GoWorkspace{{`
`252`	`257`	`BaseDir: ".",`
`253`	`258`	`DepMode: GoGetWithModules,`
	`259`	`+ ModMode: getModMode(GoGetWithModules, "."),`
`254`	`260`	`}}`
`255`	`261`	`totalModuleFiles = 1`
`256`	`262`	`return`
`@@ -276,6 +282,7 @@ func getBuildRoots(emitDiagnostics bool) (goWorkspaces []GoWorkspace, totalModul`
`276`	`282`	`goWorkspaces = []GoWorkspace{{`
`277`	`283`	`BaseDir: ".",`
`278`	`284`	`DepMode: GoGetNoModules,`
	`285`	`+ ModMode: ModUnset,`
`279`	`286`	`}}`
`280`	`287`	`totalModuleFiles = 0`
`281`	`288`	`return`
`@@ -328,6 +335,7 @@ func getDepMode(emitDiagnostics bool) []GoWorkspace {`
`328`	`335`	`return []GoWorkspace{{`
`329`	`336`	`BaseDir: ".",`
`330`	`337`	`DepMode: Dep,`
	`338`	`+ ModMode: ModUnset,`
`331`	`339`	`}}`
`332`	`340`	`}`
`333`	`341`
`@@ -339,6 +347,7 @@ func getDepMode(emitDiagnostics bool) []GoWorkspace {`
`339`	`347`	`return []GoWorkspace{{`
`340`	`348`	`BaseDir: ".",`
`341`	`349`	`DepMode: Glide,`
	`350`	`+ ModMode: ModUnset,`
`342`	`351`	`}}`
`343`	`352`	`}`
`344`	`353`	`return goWorkspaces`