Revert "Support fork of goimports for modules #2098"

This reverts commit d6b0f63.

src/goFormat.ts

@@ -10,7 +10,6 @@ import cp = require('child_process');
 import path = require('path');
 import { promptForMissingTool, promptForUpdatingTool } from './goInstallTools';
 import { sendTelemetryEvent, getBinPath, getToolsEnvVars, killTree } from './util';
-import { isModSupported } from './goModules';
 
 export class GoDocumentFormattingEditProvider implements vscode.DocumentFormattingEditProvider {
 
@@ -35,18 +34,15 @@ export class GoDocumentFormattingEditProvider implements vscode.DocumentFormatti
 			formatFlags.push('-style=indent=' + options.tabSize);
 		}
 
-		const formatToolPromise = formatTool !== 'goimports' ? Promise.resolve(formatTool) : isModSupported(document.uri).then(isMod => isMod ? 'goimports-gomod' : 'goimports');
-		return formatToolPromise.then(updatedFormatTool => {
-			return this.runFormatter(updatedFormatTool, formatFlags, document, token).then(edits => edits, err => {
-				if (typeof err === 'string' && err.startsWith('flag provided but not defined: -srcdir')) {
-					promptForUpdatingTool(updatedFormatTool);
-					return Promise.resolve([]);
-				}
-				if (err) {
-					console.log(err);
-					return Promise.reject('Check the console in dev tools to find errors when formatting.');
-				}
-			});
+		return this.runFormatter(formatTool, formatFlags, document, token).then(edits => edits, err => {
+			if (typeof err === 'string' && err.startsWith('flag provided but not defined: -srcdir')) {
+				promptForUpdatingTool(formatTool);
+				return Promise.resolve([]);
+			}
+			if (err) {
+				console.log(err);
+				return Promise.reject('Check the console in dev tools to find errors when formatting.');
+			}
 		});
 	}
 

src/goInstallTools.ts

@@ -31,7 +31,6 @@ const _allTools: { [key: string]: string } = {
 	'godef-gomod': 'github.com/ianthehat/godef',
 	'gogetdoc': 'github.com/zmb3/gogetdoc',
 	'goimports': 'golang.org/x/tools/cmd/goimports',
-	'goimports-gomod': 'github.com/heschik/goimports/cmd/goimports',
 	'goreturns': 'github.com/sqs/goreturns',
 	'goformat': 'winterdrache.de/goformat/goformat',
 	'golint': 'golang.org/x/lint/golint',
@@ -66,7 +65,6 @@ const importantTools = [
 	'gogetdoc',
 	'goreturns',
 	'goimports',
-	'goimports-gomod',
 	'golint',
 	'gometalinter',
 	'megacheck',
@@ -104,10 +102,6 @@ function getTools(goVersion: SemVersion): string[] {
 	// Install the formattool that was chosen by the user
 	if (goConfig['formatTool'] === 'goimports') {
 		tools.push('goimports');
-		// godef-gomod needed in go 1.11 & higher
-		if (!goVersion || (goVersion.major === 1 && goVersion.minor >= 11)) {
-			tools.push('goimports-gomod');
-		}
 	} else if (goConfig['formatTool'] === 'goformat') {
 		tools.push('goformat');
 	} else if (goConfig['formatTool'] === 'goreturns') {
@@ -180,7 +174,6 @@ export function installAllTools(updateExistingToolsOnly: boolean = false) {
 		'godef-gomod': '\t(Go to definition, works with Modules)',
 		'gogetdoc': '\t(Go to definition & text shown on hover)',
 		'goimports': '\t(Formatter)',
-		'goimports-gomod': '\t(Formatter, works with Modules)',
 		'goreturns': '\t(Formatter)',
 		'goformat': '\t(Formatter)',
 		'golint': '\t\t(Linter)',
@@ -247,10 +240,7 @@ export function promptForMissingTool(tool: string) {
 				msg = `To provide auto-completions when using Go modules, we are testing a fork(${getToolImportPath(tool, goVersion)}) of "gocode" and an updated version of "gopkgs". Please press the Install button to install them.`;
 			} else if (tool === 'godef-gomod') {
 				msg = `To provide the Go to definition feature when using Go modules, we are testing a fork(${getToolImportPath(tool, goVersion)}) of "godef". Please press the Install button to install it.`;
-			} else if (tool === 'goimports-gomod') {
-				msg = `To provide the formatting feature when using Go modules, we are testing a fork(${getToolImportPath(tool, goVersion)}) of "goimports". Please press the Install button to install it.`;
 			}
-
 			vscode.window.showInformationMessage(msg, ...items).then(selected => {
 				if (selected === 'Install') {
 					if (tool === 'gocode-gomod') {