Skip to content

Commit ea2be8f

Browse files
committed
package.json: delete go.overwriteGoplsMiddleware setting
This option has been marked as 'deprecated' for a while. We always overwrite codelens info from gopls to invoke extension's own test/benchmark commands. Change-Id: I3e1f802c5588847fef3f1576b457a9a360ab08ba Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/304775 Trust: Hyang-Ah Hana Kim <[email protected]> Run-TryBot: Hyang-Ah Hana Kim <[email protected]> Reviewed-by: Suzy Mueller <[email protected]> TryBot-Result: kokoro <[email protected]>
1 parent 51baf3c commit ea2be8f

File tree

3 files changed

+0
-44
lines changed

3 files changed

+0
-44
lines changed

docs/settings.md

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -344,14 +344,6 @@ The logging level the extension logs at, defaults to 'error'<br/>
344344
Allowed Options: `off`, `error`, `info`, `verbose`
345345

346346
Default: `"error"`
347-
### `go.overwriteGoplsMiddleware (deprecated)`
348-
349-
This option is deprecated.
350-
This option provides a set of flags which determine if vscode-go should intercept certain commands from gopls. These flags assume the `gopls` settings, which enable codelens from gopls, are also present.
351-
| Properties | Description |
352-
| --- | --- |
353-
| `codelens` | |
354-
| `default` | |
355347
### `go.playground`
356348

357349
The flags configured here will be passed through to command `goplay`

package.json

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1424,35 +1424,6 @@
14241424
"description": "Feature level setting to enable/disable code lens for references and run/debug tests",
14251425
"scope": "resource"
14261426
},
1427-
"go.overwriteGoplsMiddleware": {
1428-
"type": "object",
1429-
"properties": {
1430-
"codelens": {
1431-
"type": "object",
1432-
"properties": {
1433-
"test": {
1434-
"type": "boolean",
1435-
"default": false,
1436-
"description": "'test' codelens will be handled by gopls if true"
1437-
},
1438-
"bench": {
1439-
"type": "boolean",
1440-
"default": false,
1441-
"description": "'benchmark' codelens will be handled by gopls if true"
1442-
}
1443-
}
1444-
},
1445-
"default": {
1446-
"codelens": {
1447-
"test": false,
1448-
"bench": false
1449-
}
1450-
}
1451-
},
1452-
"scope": "resource",
1453-
"deprecationMessage": "This option is deprecated.",
1454-
"description": "This option provides a set of flags which determine if vscode-go should intercept certain commands from gopls. These flags assume the `gopls` settings, which enable codelens from gopls, are also present."
1455-
},
14561427
"go.addTags": {
14571428
"type": "object",
14581429
"properties": {

src/goLanguageServer.ts

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -551,19 +551,12 @@ export async function buildLanguageClient(cfg: BuildLanguageClientOption): Promi
551551
if (!codeLens || codeLens.length === 0) {
552552
return codeLens;
553553
}
554-
const goplsEnabledLens = (getGoConfig().get('overwriteGoplsMiddleware') as any)?.codelens ?? {};
555554
return codeLens.reduce((lenses: vscode.CodeLens[], lens: vscode.CodeLens) => {
556555
switch (lens.command.title) {
557556
case 'run test': {
558-
if (goplsEnabledLens.test) {
559-
return [...lenses, lens];
560-
}
561557
return [...lenses, ...createTestCodeLens(lens)];
562558
}
563559
case 'run benchmark': {
564-
if (goplsEnabledLens.bench) {
565-
return [...lenses, lens];
566-
}
567560
return [...lenses, ...createBenchmarkCodeLens(lens)];
568561
}
569562
default: {

0 commit comments

Comments
 (0)