@@ -9,13 +9,8 @@ import path = require('path');
9
9
import util = require( 'util' ) ;
10
10
import vscode = require( 'vscode' ) ;
11
11
import vscodeUri = require( 'vscode-uri' ) ;
12
- import { getGoConfig } from './config' ;
13
12
import { toolExecutionEnvironment } from './goEnv' ;
14
- import { getFormatTool } from './language/legacy/goFormat' ;
15
- import { installTools } from './goInstallTools' ;
16
13
import { outputChannel } from './goStatus' ;
17
- import { getTool } from './goTools' ;
18
- import { getFromGlobalState , updateGlobalState } from './stateUtils' ;
19
14
import { getBinPath , getGoVersion , getModuleCache , getWorkspaceFolderPath } from './util' ;
20
15
import { getEnvPath , fixDriveCasingInWindows , getCurrentGoRoot } from './utils/pathUtils' ;
21
16
import { CommandFactory } from './commands' ;
@@ -77,68 +72,11 @@ export async function getModFolderPath(fileuri?: vscode.Uri, isDir?: boolean): P
77
72
goModEnvJSON [ 'GOMOD' ] === '/dev/null' || goModEnvJSON [ 'GOMOD' ] === 'NUL' ? '' : goModEnvJSON [ 'GOMOD' ] ;
78
73
if ( goModEnvResult ) {
79
74
goModEnvResult = path . dirname ( goModEnvResult ) ;
80
- const goConfig = getGoConfig ( fileuri ) ;
81
- if ( goConfig [ 'useLanguageServer' ] === false && getFormatTool ( goConfig ) === 'goreturns' ) {
82
- const promptFormatToolMsg =
83
- 'The goreturns tool does not support Go modules. Please update the "formatTool" setting to "goimports".' ;
84
- promptToUpdateToolForModules ( 'switchFormatToolToGoimports' , promptFormatToolMsg , goConfig ) ;
85
- }
86
75
}
87
76
packagePathToGoModPathMap [ pkgPath ] = goModEnvResult ;
88
77
return goModEnvResult ;
89
78
}
90
79
91
- const promptedToolsForCurrentSession = new Set < string > ( ) ;
92
- export async function promptToUpdateToolForModules (
93
- tool : string ,
94
- promptMsg : string ,
95
- goConfig ?: vscode . WorkspaceConfiguration
96
- ) : Promise < boolean > {
97
- if ( promptedToolsForCurrentSession . has ( tool ) ) {
98
- return false ;
99
- }
100
- const promptedToolsForModules = getFromGlobalState ( 'promptedToolsForModules' , { } ) ;
101
- if ( promptedToolsForModules [ tool ] ) {
102
- return false ;
103
- }
104
- const goVersion = await getGoVersion ( ) ;
105
- const selected = await vscode . window . showInformationMessage ( promptMsg , 'Update' , 'Later' , "Don't show again" ) ;
106
- let choseToUpdate = false ;
107
- switch ( selected ) {
108
- case 'Update' :
109
- choseToUpdate = true ;
110
- if ( ! goConfig ) {
111
- goConfig = getGoConfig ( ) ;
112
- }
113
- await installTools ( [ getTool ( tool ) ] , goVersion ) ;
114
- switch ( tool ) {
115
- case 'switchFormatToolToGoimports' :
116
- goConfig . update ( 'formatTool' , 'goimports' , vscode . ConfigurationTarget . Global ) ;
117
- break ;
118
- case 'gopls' :
119
- if ( goConfig . get ( 'useLanguageServer' ) === false ) {
120
- goConfig . update ( 'useLanguageServer' , true , vscode . ConfigurationTarget . Global ) ;
121
- }
122
- if ( goConfig . inspect ( 'useLanguageServer' ) ?. workspaceFolderValue === false ) {
123
- goConfig . update ( 'useLanguageServer' , true , vscode . ConfigurationTarget . WorkspaceFolder ) ;
124
- }
125
- break ;
126
- }
127
- promptedToolsForModules [ tool ] = true ;
128
- updateGlobalState ( 'promptedToolsForModules' , promptedToolsForModules ) ;
129
- break ;
130
- case "Don't show again" :
131
- promptedToolsForModules [ tool ] = true ;
132
- updateGlobalState ( 'promptedToolsForModules' , promptedToolsForModules ) ;
133
- break ;
134
- case 'Later' :
135
- default :
136
- promptedToolsForCurrentSession . add ( tool ) ;
137
- break ;
138
- }
139
- return choseToUpdate ;
140
- }
141
-
142
80
const folderToPackageMapping : { [ key : string ] : string } = { } ;
143
81
export async function getCurrentPackage ( cwd : string ) : Promise < string > {
144
82
if ( folderToPackageMapping [ cwd ] ) {
0 commit comments