fix: resolve conflicts with master branch

Author: vuon9

CHANGELOG.md

@@ -1,3 +1,37 @@
+## v0.32.0 - 8 Mar, 2022
+
+This version includes features to enhance Go 1.18 support. It works best when paired with the latest Go Language Server ([`gopls` v0.8.0+](https://github.com/golang/tools/releases/tag/gopls%2Fv0.8.0)) and Delve ([`dlv` v1.8.0+](https://github.com/go-delve/delve/blob/master/CHANGELOG.md#changelog)).
+
+[Go 1.18](https://go.dev/doc/go1.18) introduces substantial changes to [the language spec](https://go.dev/doc/go1.18#generics), so many tools need rebuilding with Go 1.18 or newer. The extension now suggests updates of tools if it finds they were built with old versions of `go` which are inadequate for the version used for the project. If you [opted in for auto-update](https://github.com/golang/vscode-go/blob/master/docs/settings.md#gotoolsmanagementautoupdate), tools will be auto-updated.
+
+In order to use Go 1.18, please follow [the instruction to configure your Visual Studio Code to locate the right go binary](https://github.com/golang/vscode-go/blob/master/docs/advanced.md#using-go118), and run the Go tools using the "Go: Install/Update Tools" command.
+
+A list of all issues and changes can be found in the [v0.32.0 milestone](https://github.com/golang/vscode-go/milestone/42) and [commit history](https://github.com/golang/vscode-go/compare/v0.31.1...v0.32.0).
+
+### Changes
+
+- Starting with Go 1.18,  the `go` command provides native support for multi-module workspaces, via  [`go.work`](https://go.dev/ref/mod#workspaces) files. The new "Open 'go.work'" option in the Go status bar's quickpick menu allows users to access the corresponding `go.work` file.
+![go work short](https://user-images.githubusercontent.com/4999471/157268414-fba63843-5a14-44ba-be82-d42765568856.gif)
+
+- The extension no longer depends on [`gopkgs`](https://github.com/uudashr/gopkgs/cmd/gopkgs). Its use for "Go: Browse Packages" and "Go: Add Import" commands had been replaced with `go list` or commands in `gopls`. ([Issue 258](https://github.com/golang/vscode-go/issues/258))
+
+- The extension uses `gopls` instead of `go-outline` if `gopls` v0.8.0 or newer is used. We plan to complete the replacement work in the next release. ([Issue 1020](https://github.com/golang/vscode-go/issue/1020))
+
+- The new [`"go.toolsManagement.go"` setting](https://github.com/golang/vscode-go/blob/master/docs/settings.md#gotoolsmanagementgo) allows users to specify the Go command for tools installation/updates separate from the Go command used for the project.
+
+- The latest `gopls` requires go 1.13+ for installation, so the extension no longer asks for `gopls` updates when an older versions of `go` is used. ([Issue 2030](https://github.com/golang/vscode-go/issues/2030)) Note `gopls` compiled with go 1.13 or newer can still process projects that use go 1.12. If you want to update `gopls` while working with an older version of Go, utilize the new `"go.toolsManagement.go"` setting.
+
+- Reduced the verbosity of "Go: Locate Configured Go Tools" output.
+
+### Code Health
+- Updated to [email protected] (CVE-2021-23566).
+- Deflaked debug tests.
+- Changed to check `go.dev/dl` instead of `golang.org/dl` for Go release.
+- Improved documentation for the default formatting behavior  and template support.
+
+### Thanks
+@jamalc @suzmue @pavlelee @dekimsey @hyangah
+
 ## v0.31.1 - 8 Feb, 2022
 
 A list of all issues and changes can be found in the [v0.31.1 milestone](https://github.com/golang/vscode-go/milestone/44) and [commit history](https://github.com/golang/vscode-go/compare/v0.31.0...v0.31.1).

codereview.cfg

@@ -0,0 +1 @@
+issuerepo: golang/vscode-go

docs/commands.md

@@ -242,3 +242,11 @@ Reset keys in workspace state to undefined.
 ### `Go: Reset Global State`
 
 Reset keys in global state to undefined.
+
+### `Go Explorer: Refresh`
+
+Refresh the Go explorer. Only available as a menu item in the explorer.
+
+### `Go Explorer: Open File`
+
+Open a file from the Go explorer. Only available as a menu item in the explorer.

docs/settings.md

@@ -174,7 +174,7 @@ Experimental Feature: Enable/Disable entries from the context menu in the editor
 | `fillStruct` | If true, adds command to fill struct literal with default values to the editor context menu <br/> Default: `true` |
 | `generateTestForFile` | If true, adds command to generate unit tests for current file to the editor context menu <br/> Default: `true` |
 | `generateTestForFunction` | If true, adds command to generate unit tests for function under the cursor to the editor context menu <br/> Default: `true` |
-| `generateTestForPackage` | If true, adds command to generate unit tests for currnt package to the editor context menu <br/> Default: `true` |
+| `generateTestForPackage` | If true, adds command to generate unit tests for current package to the editor context menu <br/> Default: `true` |
 | `playground` | If true, adds command to upload the current file or selection to the Go Playground <br/> Default: `true` |
 | `removeTags` | If true, adds command to remove configured tags from struct fields to the editor context menu <br/> Default: `true` |
 | `testAtCursor` | If true, adds command to run the test under the cursor to the editor context menu <br/> Default: `false` |
@@ -456,6 +456,11 @@ Allowed Options:
 
 
 Default: `"proxy"`
+### `go.toolsManagement.go`
+
+The path to the `go` binary used to install the Go tools. If it's empty, the same `go` binary chosen for the project will be used for tool installation.
+
+Default: `""`
 ### `go.trace.server`
 
 Trace the communication between VS Code and the Go language server.<br/>
@@ -743,6 +748,7 @@ Example Usage:
 | `stdmethods` | check signature of methods of well-known interfaces <br/> Sometimes a type may be intended to satisfy an interface but may fail to do so because of a mistake in its method signature. For example, the result of this WriteTo method should be (int64, error), not error, to satisfy io.WriterTo: <br/> <pre>type myWriterTo struct{...}</pre>        func (myWriterTo) WriteTo(w io.Writer) error { ... } <br/> This check ensures that each method whose name matches one of several well-known interface methods from the standard library has the correct signature for that interface. <br/> Checked method names include: <pre>Format GobEncode GobDecode MarshalJSON MarshalXML<br/>Peek ReadByte ReadFrom ReadRune Scan Seek<br/>UnmarshalJSON UnreadByte UnreadRune WriteByte<br/>WriteTo</pre><br/> <br/> Default: `true` |
 | `stringintconv` | check for string(int) conversions <br/> This checker flags conversions of the form string(x) where x is an integer (but not byte or rune) type. Such conversions are discouraged because they return the UTF-8 representation of the Unicode code point x, and not a decimal string representation of x as one might expect. Furthermore, if x denotes an invalid code point, the conversion cannot be statically rejected. <br/> For conversions that intend on using the code point, consider replacing them with string(rune(x)). Otherwise, strconv.Itoa and its equivalents return the string representation of the value in the desired base. <br/> <br/> Default: `true` |
 | `structtag` | check that struct field tags conform to reflect.StructTag.Get <br/> Also report certain struct tags (json, xml) used with unexported fields. <br/> Default: `true` |
+| `stubmethods` | stub methods analyzer <br/> This analyzer generates method stubs for concrete types in order to implement a target interface <br/> Default: `true` |
 | `testinggoroutine` | report calls to (*testing.T).Fatal from goroutines started by a test. <br/> Functions that abruptly terminate a test, such as the Fatal, Fatalf, FailNow, and Skip{,f,Now} methods of *testing.T, must be called from the test goroutine itself. This checker detects calls to these functions that occur within a goroutine started by the test. For example: <br/> func TestFoo(t *testing.T) {     go func() {         t.Fatal("oops") // error: (*T).Fatal called from non-test goroutine     }() } <br/> <br/> Default: `true` |
 | `tests` | check for common mistaken usages of tests and examples <br/> The tests checker walks Test, Benchmark and Example functions checking malformed names, wrong signatures and examples documenting non-existent identifiers. <br/> Please see the documentation for package testing in golang.org/pkg/testing for the conventions that are enforced for Tests, Benchmarks, and Examples. <br/> Default: `true` |
 | `undeclaredname` | suggested fixes for "undeclared name: <>" <br/> This checker provides suggested fixes for type errors of the type "undeclared name: <>". It will either insert a new statement, such as: <br/> "<> := " <br/> or a new function declaration, such as: <br/> func <>(inferred parameters) { <pre>panic("implement me!")</pre>} <br/> <br/> Default: `true` |
@@ -752,7 +758,7 @@ Example Usage:
 | `unusedparams` | check for unused parameters of functions <br/> The unusedparams analyzer checks functions to see if there are any parameters that are not being used. <br/> To reduce false positives it ignores: - methods - parameters that do not have a name or are underscored - functions in test files - functions with empty bodies or those with just a return stmt <br/> Default: `false` |
 | `unusedresult` | check for unused results of calls to some functions <br/> Some functions like fmt.Errorf return a result and have no side effects, so it is always a mistake to discard the result. This analyzer reports calls to certain functions in which the result of the call is ignored. <br/> The set of functions may be controlled using flags. <br/> Default: `true` |
 | `unusedwrite` | checks for unused writes <br/> The analyzer reports instances of writes to struct fields and arrays that are never read. Specifically, when a struct object or an array is copied, its elements are copied implicitly by the compiler, and any element write to this copy does nothing with the original object. <br/> For example: <br/> <pre>type T struct { x int }<br/>func f(input []T) {<br/>	for i, v := range input {  // v is a copy<br/>		v.x = i  // unused write to field x<br/>	}<br/>}</pre><br/> Another example is about non-pointer receiver: <br/> <pre>type T struct { x int }<br/>func (t T) f() {  // t is a copy<br/>	t.x = i  // unused write to field x<br/>}</pre><br/> <br/> Default: `false` |
-| `useany` | check for constraints that could be simplified to "any" <br/> Default: `true` |
+| `useany` | check for constraints that could be simplified to "any" <br/> Default: `false` |
 ### `ui.diagnostic.annotations`
 
 (Experimental) annotations specifies the various kinds of optimization diagnostics

media/go-logo-white.svg

@@ -1,7 +1,7 @@
 {
   "name": "go",
   "displayName": "Go",
-  "version": "0.32.0-dev",
+  "version": "0.33.0-dev",
   "preview": true,
   "publisher": "golang",
   "description": "Rich Go language support for Visual Studio Code",
@@ -61,6 +61,7 @@
     "vscode-debugprotocol": "1.45.0",
     "vscode-languageclient": "7.0.0",
     "vscode-languageserver-protocol": "3.16.0",
+    "vscode-uri": "3.0.3",
     "web-request": "1.0.7"
   },
   "devDependencies": {
@@ -116,7 +117,8 @@
         "go.goroot",
         "go.inferGopath",
         "go.toolsGopath",
-        "go.toolsEnvVars"
+        "go.toolsEnvVars",
+        "go.toolsManagement.go"
       ]
     }
   },
@@ -178,6 +180,11 @@
         "scopeName": "go.mod",
         "path": "./syntaxes/go.mod.tmGrammar.json"
       },
+      {
+        "language": "go.work",
+        "scopeName": "go.mod",
+        "path": "./syntaxes/go.mod.tmGrammar.json"
+      },
       {
         "language": "go.sum",
         "scopeName": "go.sum",
@@ -486,6 +493,20 @@
         "command": "go.runMain",
         "title": "Go: Run main() func on file",
         "description": "Run main() func on file"
+      },
+      {
+        "command": "go.explorer.refresh",
+        "title": "Go Explorer: Refresh",
+        "description": "Refresh the Go explorer. Only available as a menu item in the explorer.",
+        "category": "Explorer",
+        "icon": "$(refresh)"
+      },
+      {
+        "command": "go.explorer.open",
+        "title": "Go Explorer: Open File",
+        "description": "Open a file from the Go explorer. Only available as a menu item in the explorer.",
+        "category": "Explorer",
+        "icon": "$(go-to-file)"
       }
     ],
     "breakpoints": [
@@ -1533,6 +1554,12 @@
           "description": "The logging level the extension logs at, defaults to 'error'",
           "scope": "machine-overridable"
         },
+        "go.toolsManagement.go": {
+          "type": "string",
+          "default": "",
+          "description": "The path to the `go` binary used to install the Go tools. If it's empty, the same `go` binary chosen for the project will be used for tool installation.",
+          "scope": "machine-overridable"
+        },
         "go.toolsManagement.checkForUpdates": {
           "type": "string",
           "default": "proxy",
@@ -1780,7 +1807,7 @@
             "generateTestForPackage": {
               "type": "boolean",
               "default": true,
-              "description": "If true, adds command to generate unit tests for currnt package to the editor context menu"
+              "description": "If true, adds command to generate unit tests for current package to the editor context menu"
             },
             "addImport": {
               "type": "boolean",
@@ -2336,6 +2363,11 @@
                   "markdownDescription": "check that struct field tags conform to reflect.StructTag.Get\n\nAlso report certain struct tags (json, xml) used with unexported fields.",
                   "default": true
                 },
+                "stubmethods": {
+                  "type": "boolean",
+                  "markdownDescription": "stub methods analyzer\n\nThis analyzer generates method stubs for concrete types\nin order to implement a target interface",
+                  "default": true
+                },
                 "testinggoroutine": {
                   "type": "boolean",
                   "markdownDescription": "report calls to (*testing.T).Fatal from goroutines started by a test.\n\nFunctions that abruptly terminate a test, such as the Fatal, Fatalf, FailNow, and\nSkip{,f,Now} methods of *testing.T, must be called from the test goroutine itself.\nThis checker detects calls to these functions that occur within a goroutine\nstarted by the test. For example:\n\nfunc TestFoo(t *testing.T) {\n    go func() {\n        t.Fatal(\"oops\") // error: (*T).Fatal called from non-test goroutine\n    }()\n}\n",
@@ -2384,7 +2416,7 @@
                 "useany": {
                   "type": "boolean",
                   "markdownDescription": "check for constraints that could be simplified to \"any\"",
-                  "default": true
+                  "default": false
                 }
               }
             },
@@ -2548,6 +2580,14 @@
         {
           "command": "go.test.deleteProfile",
           "when": "false"
+        },
+        {
+          "command": "go.explorer.refresh",
+          "when": "false"
+        },
+        {
+          "command": "go.explorer.open",
+          "when": "false"
         }
       ],
       "editor/context": [
@@ -2649,14 +2689,33 @@
           "group": "profile"
         }
       ],
+      "view/title": [
+        {
+          "command": "go.explorer.refresh",
+          "when": "view == go.explorer",
+          "group": "navigation"
+        }
+      ],
       "view/item/context": [
         {
           "command": "go.test.deleteProfile",
           "when": "viewItem == go:test:file"
+        },
+        {
+          "command": "go.explorer.open",
+          "when": "view == go.explorer && viewItem == go:explorer:envitem:file",
+          "group": "inline"
         }
       ]
     },
     "views": {
+      "explorer": [
+        {
+          "id": "go.explorer",
+          "name": "go",
+          "icon": "media/go-logo-white.svg"
+        }
+      ],
       "test": [
         {
           "id": "go.test.profile",