internal/lsp/cache: handle missing mod file

heschi · heschi · commit 31b9a74881bf · 2020-07-08T18:08:30.000Z
If the config changes in non-module mode, don't look at the nonexistant mod file. I actually caught this case after review but didn't finish the job. Fixes golang/go#40121. Change-Id: Ic888f7eab5f882e6ca79b046b5a3fb37b3b19e5c Reviewed-on: https://go-review.googlesource.com/c/tools/+/241520 Run-TryBot: Heschi Kreinick <heschi@google.com> Reviewed-by: Rebecca Stambler <rstambler@golang.org> TryBot-Result: Gobot Gobot <gobot@golang.org>
diff --git a/internal/lsp/cache/view.go b/internal/lsp/cache/view.go
@@ -407,7 +407,7 @@ func (v *View) RunProcessEnvFunc(ctx context.Context, fn func(*imports.Options)
 			}
 			v.cleanupProcessEnv()
 		}
-		v.cachedModFileIdentifier = modFH.Identity().Identifier
+		v.cachedModFileIdentifier = modFileIdentifier
 		v.cachedBuildFlags = currentBuildFlags
 		v.cleanupProcessEnv, err = v.populateProcessEnv(ctx, modFH, sumFH)
 		if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -407,7 +407,7 @@ func (v View) RunProcessEnvFunc(ctx context.Context, fn func(imports.Options)`
`407`	`407`	`}`
`408`	`408`	`v.cleanupProcessEnv()`
`409`	`409`	`}`
`410`		`- v.cachedModFileIdentifier = modFH.Identity().Identifier`
	`410`	`+ v.cachedModFileIdentifier = modFileIdentifier`
`411`	`411`	`v.cachedBuildFlags = currentBuildFlags`
`412`	`412`	`v.cleanupProcessEnv, err = v.populateProcessEnv(ctx, modFH, sumFH)`
`413`	`413`	`if err != nil {`