src/language: move language features to the language directory

Legacy features are in src/language/legacy

Change-Id: I05836738fbc11208384235bd456fa1f911815bda
Reviewed-on: https://go-review.googlesource.com/c/vscode-go/+/387960
Trust: Hyang-Ah Hana Kim <[email protected]>
Run-TryBot: Hyang-Ah Hana Kim <[email protected]>
Reviewed-by: Jamal Carvalho <[email protected]>
Reviewed-by: Suzy Mueller <[email protected]>

src/goCheck.ts

@@ -11,7 +11,7 @@ import path = require('path');
 import vscode = require('vscode');
 import { getGoplsConfig } from './config';
 import { goBuild } from './goBuild';
-import { buildLanguageServerConfig } from './goLanguageServer';
+import { buildLanguageServerConfig } from './language/goLanguageServer';
 import { goLint } from './goLint';
 import { buildDiagnosticCollection, lintDiagnosticCollection, vetDiagnosticCollection } from './goMain';
 import { isModSupported } from './goModules';

src/goDeveloperSurvey.ts

@@ -8,7 +8,7 @@
 
 import vscode = require('vscode');
 import { getGoConfig } from './config';
-import { lastUserAction } from './goLanguageServer';
+import { lastUserAction } from './language/goLanguageServer';
 import { daysBetween, flushSurveyConfig, getStateConfig, minutesBetween, timeMinute } from './goSurvey';
 
 // Start and end dates of the survey.

src/goGenerateTests.ts

@@ -14,7 +14,7 @@ import vscode = require('vscode');
 import { getGoConfig } from './config';
 import { toolExecutionEnvironment } from './goEnv';
 import { promptForMissingTool } from './goInstallTools';
-import { GoDocumentSymbolProvider } from './goOutline';
+import { GoDocumentSymbolProvider } from './language/legacy/goOutline';
 import { outputChannel } from './goStatus';
 import { getBinPath } from './util';
 

src/goImport.ts

@@ -12,8 +12,8 @@ import vscode = require('vscode');
 import { ExecuteCommandRequest, ExecuteCommandParams } from 'vscode-languageserver-protocol';
 import { toolExecutionEnvironment } from './goEnv';
 import { promptForMissingTool } from './goInstallTools';
-import { languageClient, serverInfo } from './goLanguageServer';
-import { documentSymbols, GoOutlineImportsOptions } from './goOutline';
+import { languageClient, serverInfo } from './language/goLanguageServer';
+import { documentSymbols, GoOutlineImportsOptions } from './language/legacy/goOutline';
 import { getImportablePackages } from './goPackages';
 import { getBinPath, getImportPath, parseFilePrelude } from './util';
 import { envPath, getCurrentGoRoot } from './utils/pathUtils';

src/goMain.ts

@@ -51,7 +51,7 @@ import {
 	showServerOutputChannel,
 	startLanguageServerWithFallback,
 	watchLanguageServerConfiguration
-} from './goLanguageServer';
+} from './language/goLanguageServer';
 import { lintCode } from './goLint';
 import { logVerbose, setLogConfig } from './goLogging';
 import { GO_MODE } from './goMode';
@@ -103,7 +103,7 @@ import { clearCacheForTools, fileExists, getCurrentGoRoot, dirExists, envPath }
 import { WelcomePanel } from './welcome';
 import semver = require('semver');
 import vscode = require('vscode');
-import { getFormatTool } from './goFormat';
+import { getFormatTool } from './language/legacy/goFormat';
 import { resetSurveyConfigs, showSurveyConfig, timeMinute } from './goSurvey';
 import { ExtensionAPI } from './export';
 import extensionAPI from './extensionAPI';

src/goModules.ts

@@ -11,7 +11,7 @@ import vscode = require('vscode');
 import vscodeUri = require('vscode-uri');
 import { getGoConfig } from './config';
 import { toolExecutionEnvironment } from './goEnv';
-import { getFormatTool } from './goFormat';
+import { getFormatTool } from './language/legacy/goFormat';
 import { installTools } from './goInstallTools';
 import { outputChannel } from './goStatus';
 import { getTool } from './goTools';

src/goReferencesCodelens.ts

@@ -10,8 +10,8 @@ import { isAbsolute } from 'path';
 import { CancellationToken, CodeLens, Range, TextDocument } from 'vscode';
 import { getGoConfig } from './config';
 import { GoBaseCodeLensProvider } from './goBaseCodelens';
-import { GoDocumentSymbolProvider } from './goOutline';
-import { GoReferenceProvider } from './goReferences';
+import { GoDocumentSymbolProvider } from './language/legacy/goOutline';
+import { GoReferenceProvider } from './language/legacy/goReferences';
 import { getBinPath } from './util';
 import vscode = require('vscode');
 

src/goRunTestCodelens.ts

@@ -11,7 +11,7 @@ import vscode = require('vscode');
 import { CancellationToken, CodeLens, TextDocument } from 'vscode';
 import { getGoConfig } from './config';
 import { GoBaseCodeLensProvider } from './goBaseCodelens';
-import { GoDocumentSymbolProvider } from './goOutline';
+import { GoDocumentSymbolProvider } from './language/legacy/goOutline';
 import { getBenchmarkFunctions, getTestFunctions } from './testUtils';
 
 export class GoRunTestCodeLensProvider extends GoBaseCodeLensProvider {

src/goStatus.ts

@@ -16,7 +16,7 @@ import {
 	getLocalGoplsVersion,
 	languageServerIsRunning,
 	serverOutputChannel
-} from './goLanguageServer';
+} from './language/goLanguageServer';
 import { isGoFile } from './goMode';
 import { isModSupported, runGoEnv } from './goModules';
 import { allToolsInformation } from './goToolsInformation';

src/goSurvey.ts

@@ -7,7 +7,7 @@
 'use strict';
 
 import vscode = require('vscode');
-import { getLocalGoplsVersion, lastUserAction, latestConfig } from './goLanguageServer';
+import { getLocalGoplsVersion, lastUserAction, latestConfig } from './language/goLanguageServer';
 import { outputChannel } from './goStatus';
 import { extensionId } from './const';
 import { getFromGlobalState, getFromWorkspaceState, updateGlobalState } from './stateUtils';

src/goTest/explore.ts

@@ -18,7 +18,7 @@ import {
 	WorkspaceFoldersChangeEvent
 } from 'vscode';
 import vscode = require('vscode');
-import { GoDocumentSymbolProvider } from '../goOutline';
+import { GoDocumentSymbolProvider } from '../language/legacy/goOutline';
 import { outputChannel } from '../goStatus';
 import { dispose, disposeIfEmpty, findItem, GoTest, isInTest, Workspace } from './utils';
 import { GoTestResolver, ProvideSymbols } from './resolve';

src/goTools.ts

@@ -11,8 +11,8 @@ import moment = require('moment');
 import path = require('path');
 import semver = require('semver');
 import util = require('util');
-import { getFormatTool, usingCustomFormatTool } from './goFormat';
-import { goLiveErrorsEnabled } from './goLiveErrors';
+import { getFormatTool, usingCustomFormatTool } from './language/legacy/goFormat';
+import { goLiveErrorsEnabled } from './language/legacy/goLiveErrors';
 import { allToolsInformation } from './goToolsInformation';
 import { getBinPath, GoVersion } from './util';
 

src/goLanguageServer.ts → src/language/goLanguageServer.ts

@@ -34,47 +34,47 @@ import {
 	RevealOutputChannelOn
 } from 'vscode-languageclient';
 import { LanguageClient } from 'vscode-languageclient/node';
-import { getGoConfig, getGoplsConfig, extensionInfo } from './config';
-import { GoCodeActionProvider } from './goCodeAction';
-import { GoDefinitionProvider } from './goDeclaration';
-import { toolExecutionEnvironment } from './goEnv';
-import { GoHoverProvider } from './goExtraInfo';
-import { GoDocumentFormattingEditProvider, usingCustomFormatTool } from './goFormat';
-import { GoImplementationProvider } from './goImplementations';
-import { installTools, latestToolVersion, promptForMissingTool, promptForUpdatingTool } from './goInstallTools';
-import { parseLiveFile } from './goLiveErrors';
+import { getGoConfig, getGoplsConfig, extensionInfo } from '../config';
+import { GoCodeActionProvider } from './legacy/goCodeAction';
+import { GoDefinitionProvider } from './legacy/goDeclaration';
+import { toolExecutionEnvironment } from '../goEnv';
+import { GoHoverProvider } from './legacy/goExtraInfo';
+import { GoDocumentFormattingEditProvider, usingCustomFormatTool } from './legacy/goFormat';
+import { GoImplementationProvider } from './legacy/goImplementations';
+import { installTools, latestToolVersion, promptForMissingTool, promptForUpdatingTool } from '../goInstallTools';
+import { parseLiveFile } from './legacy/goLiveErrors';
 import {
 	buildDiagnosticCollection,
 	lintDiagnosticCollection,
 	restartLanguageServer,
 	vetDiagnosticCollection
-} from './goMain';
-import { GO_MODE } from './goMode';
-import { GoDocumentSymbolProvider } from './goOutline';
-import { GoReferenceProvider } from './goReferences';
-import { GoRenameProvider } from './goRename';
-import { GoSignatureHelpProvider } from './goSignature';
-import { outputChannel, updateLanguageServerIconGoStatusBar } from './goStatus';
-import { GoCompletionItemProvider } from './goSuggest';
-import { GoWorkspaceSymbolProvider } from './goSymbol';
-import { getTool, Tool } from './goTools';
-import { GoTypeDefinitionProvider } from './goTypeDefinition';
-import { getFromGlobalState, updateGlobalState, updateWorkspaceState } from './stateUtils';
+} from '../goMain';
+import { GO_MODE } from '../goMode';
+import { GoDocumentSymbolProvider } from './legacy/goOutline';
+import { GoReferenceProvider } from './legacy/goReferences';
+import { GoRenameProvider } from './legacy/goRename';
+import { GoSignatureHelpProvider } from './legacy/goSignature';
+import { outputChannel, updateLanguageServerIconGoStatusBar } from '../goStatus';
+import { GoCompletionItemProvider } from './legacy/goSuggest';
+import { GoWorkspaceSymbolProvider } from './legacy/goSymbol';
+import { getTool, Tool } from '../goTools';
+import { GoTypeDefinitionProvider } from './legacy/goTypeDefinition';
+import { getFromGlobalState, updateGlobalState, updateWorkspaceState } from '../stateUtils';
 import {
 	getBinPath,
 	getCheckForToolsUpdatesConfig,
 	getCurrentGoPath,
 	getGoVersion,
 	getWorkspaceFolderPath,
 	removeDuplicateDiagnostics
-} from './util';
-import { Mutex } from './utils/mutex';
-import { getToolFromToolPath } from './utils/pathUtils';
+} from '../util';
+import { Mutex } from '../utils/mutex';
+import { getToolFromToolPath } from '../utils/pathUtils';
 import WebRequest = require('web-request');
 import { FoldingContext } from 'vscode';
 import { ProvideFoldingRangeSignature } from 'vscode-languageclient/lib/common/foldingRange';
-import { daysBetween, getStateConfig, maybePromptForGoplsSurvey, timeDay, timeMinute } from './goSurvey';
-import { maybePromptForDeveloperSurvey } from './goDeveloperSurvey';
+import { daysBetween, getStateConfig, maybePromptForGoplsSurvey, timeDay, timeMinute } from '../goSurvey';
+import { maybePromptForDeveloperSurvey } from '../goDeveloperSurvey';
 
 interface LanguageServerConfig {
 	serverName: string;

src/goCodeAction.ts → src/language/legacy/goCodeAction.ts

@@ -7,7 +7,7 @@
 'use strict';
 
 import vscode = require('vscode');
-import { listPackages } from './goImport';
+import { listPackages } from '../../goImport';
 
 export class GoCodeActionProvider implements vscode.CodeActionProvider {
 	public provideCodeActions(

src/goDeclaration.ts → src/language/legacy/goDeclaration.ts

@@ -9,10 +9,10 @@
 import cp = require('child_process');
 import path = require('path');
 import vscode = require('vscode');
-import { getGoConfig } from './config';
-import { toolExecutionEnvironment } from './goEnv';
-import { promptForMissingTool, promptForUpdatingTool } from './goInstallTools';
-import { getModFolderPath, promptToUpdateToolForModules } from './goModules';
+import { getGoConfig } from '../../config';
+import { toolExecutionEnvironment } from '../../goEnv';
+import { promptForMissingTool, promptForUpdatingTool } from '../../goInstallTools';
+import { getModFolderPath, promptToUpdateToolForModules } from '../../goModules';
 import {
 	byteOffsetAt,
 	getBinPath,
@@ -22,9 +22,9 @@ import {
 	goKeywords,
 	isPositionInString,
 	runGodoc
-} from './util';
-import { getCurrentGoRoot } from './utils/pathUtils';
-import { killProcessTree } from './utils/processUtils';
+} from '../../util';
+import { getCurrentGoRoot } from '../../utils/pathUtils';
+import { killProcessTree } from '../../utils/processUtils';
 
 const missingToolMsg = 'Missing tool: ';
 

src/goExtraInfo.ts → src/language/legacy/goExtraInfo.ts

@@ -9,7 +9,7 @@
 
 import vscode = require('vscode');
 import { CancellationToken, Hover, HoverProvider, Position, TextDocument, WorkspaceConfiguration } from 'vscode';
-import { getGoConfig } from './config';
+import { getGoConfig } from '../../config';
 import { definitionLocation } from './goDeclaration';
 
 export class GoHoverProvider implements HoverProvider {

src/goFormat.ts → src/language/legacy/goFormat.ts

@@ -9,11 +9,11 @@
 import cp = require('child_process');
 import path = require('path');
 import vscode = require('vscode');
-import { getGoConfig } from './config';
-import { toolExecutionEnvironment } from './goEnv';
-import { promptForMissingTool, promptForUpdatingTool } from './goInstallTools';
-import { getBinPath } from './util';
-import { killProcessTree } from './utils/processUtils';
+import { getGoConfig } from '../../config';
+import { toolExecutionEnvironment } from '../../goEnv';
+import { promptForMissingTool, promptForUpdatingTool } from '../../goInstallTools';
+import { getBinPath } from '../../util';
+import { killProcessTree } from '../../utils/processUtils';
 
 export class GoDocumentFormattingEditProvider implements vscode.DocumentFormattingEditProvider {
 	public provideDocumentFormattingEdits(

src/goImplementations.ts → src/language/legacy/goImplementations.ts

@@ -9,12 +9,12 @@
 import cp = require('child_process');
 import path = require('path');
 import vscode = require('vscode');
-import { getGoConfig } from './config';
-import { toolExecutionEnvironment } from './goEnv';
-import { promptForMissingTool } from './goInstallTools';
-import { byteOffsetAt, canonicalizeGOPATHPrefix, getBinPath, getWorkspaceFolderPath } from './util';
-import { envPath, getCurrentGoRoot } from './utils/pathUtils';
-import { killProcessTree } from './utils/processUtils';
+import { getGoConfig } from '../../config';
+import { toolExecutionEnvironment } from '../../goEnv';
+import { promptForMissingTool } from '../../goInstallTools';
+import { byteOffsetAt, canonicalizeGOPATHPrefix, getBinPath, getWorkspaceFolderPath } from '../../util';
+import { envPath, getCurrentGoRoot } from '../../utils/pathUtils';
+import { killProcessTree } from '../../utils/processUtils';
 
 interface GoListOutput {
 	Dir: string;

src/goLiveErrors.ts → src/language/legacy/goLiveErrors.ts

@@ -9,12 +9,12 @@
 import cp = require('child_process');
 import path = require('path');
 import vscode = require('vscode');
-import { getGoConfig } from './config';
-import { toolExecutionEnvironment } from './goEnv';
-import { promptForMissingTool } from './goInstallTools';
-import { buildDiagnosticCollection } from './goMain';
-import { isModSupported } from './goModules';
-import { getBinPath } from './util';
+import { getGoConfig } from '../../config';
+import { toolExecutionEnvironment } from '../../goEnv';
+import { promptForMissingTool } from '../../goInstallTools';
+import { buildDiagnosticCollection } from '../../goMain';
+import { isModSupported } from '../../goModules';
+import { getBinPath } from '../../util';
 
 // Interface for settings configuration for adding and removing tags
 interface GoLiveErrorsConfig {

src/goOutline.ts → src/language/legacy/goOutline.ts

@@ -9,12 +9,12 @@
 import cp = require('child_process');
 import vscode = require('vscode');
 import { ExecuteCommandParams, ExecuteCommandRequest } from 'vscode-languageserver-protocol';
-import { getGoConfig } from './config';
-import { toolExecutionEnvironment } from './goEnv';
-import { promptForMissingTool, promptForUpdatingTool } from './goInstallTools';
-import { languageClient, serverInfo } from './goLanguageServer';
-import { getBinPath, getFileArchive, makeMemoizedByteOffsetConverter } from './util';
-import { killProcess } from './utils/processUtils';
+import { getGoConfig } from '../../config';
+import { toolExecutionEnvironment } from '../../goEnv';
+import { promptForMissingTool, promptForUpdatingTool } from '../../goInstallTools';
+import { languageClient, serverInfo } from '../goLanguageServer';
+import { getBinPath, getFileArchive, makeMemoizedByteOffsetConverter } from '../../util';
+import { killProcess } from '../../utils/processUtils';
 
 // Keep in sync with https://github.com/ramya-rao-a/go-outline
 export interface GoOutlineRange {

src/goReferences.ts → src/language/legacy/goReferences.ts

@@ -9,11 +9,11 @@
 import cp = require('child_process');
 import path = require('path');
 import vscode = require('vscode');
-import { getGoConfig } from './config';
-import { toolExecutionEnvironment } from './goEnv';
-import { promptForMissingTool } from './goInstallTools';
-import { byteOffsetAt, canonicalizeGOPATHPrefix, getBinPath, getFileArchive } from './util';
-import { killProcessTree } from './utils/processUtils';
+import { getGoConfig } from '../../config';
+import { toolExecutionEnvironment } from '../../goEnv';
+import { promptForMissingTool } from '../../goInstallTools';
+import { byteOffsetAt, canonicalizeGOPATHPrefix, getBinPath, getFileArchive } from '../../util';
+import { killProcessTree } from '../../utils/processUtils';
 
 export class GoReferenceProvider implements vscode.ReferenceProvider {
 	public provideReferences(

src/goRename.ts → src/language/legacy/goRename.ts

@@ -8,13 +8,13 @@
 
 import cp = require('child_process');
 import vscode = require('vscode');
-import { getGoConfig } from './config';
-import { Edit, FilePatch, getEditsFromUnifiedDiffStr, isDiffToolAvailable } from './diffUtils';
-import { toolExecutionEnvironment } from './goEnv';
-import { promptForMissingTool } from './goInstallTools';
-import { outputChannel } from './goStatus';
-import { byteOffsetAt, canonicalizeGOPATHPrefix, getBinPath } from './util';
-import { killProcessTree } from './utils/processUtils';
+import { getGoConfig } from '../../config';
+import { Edit, FilePatch, getEditsFromUnifiedDiffStr, isDiffToolAvailable } from '../../diffUtils';
+import { toolExecutionEnvironment } from '../../goEnv';
+import { promptForMissingTool } from '../../goInstallTools';
+import { outputChannel } from '../../goStatus';
+import { byteOffsetAt, canonicalizeGOPATHPrefix, getBinPath } from '../../util';
+import { killProcessTree } from '../../utils/processUtils';
 
 export class GoRenameProvider implements vscode.RenameProvider {
 	public provideRenameEdits(

src/goSignature.ts → src/language/legacy/goSignature.ts

@@ -16,9 +16,9 @@ import {
 	TextDocument,
 	WorkspaceConfiguration
 } from 'vscode';
-import { getGoConfig } from './config';
+import { getGoConfig } from '../../config';
 import { definitionLocation } from './goDeclaration';
-import { getParametersAndReturnType, isPositionInComment, isPositionInString } from './util';
+import { getParametersAndReturnType, isPositionInComment, isPositionInString } from '../../util';
 
 export class GoSignatureHelpProvider implements SignatureHelpProvider {
 	constructor(private goConfig?: WorkspaceConfiguration) {}

src/goSuggest.ts → src/language/legacy/goSuggest.ts

@@ -9,12 +9,12 @@
 import cp = require('child_process');
 import path = require('path');
 import vscode = require('vscode');
-import { getGoConfig } from './config';
-import { toolExecutionEnvironment } from './goEnv';
-import { getTextEditForAddImport } from './goImport';
-import { promptForMissingTool, promptForUpdatingTool } from './goInstallTools';
-import { isModSupported } from './goModules';
-import { getImportablePackages, PackageInfo } from './goPackages';
+import { getGoConfig } from '../../config';
+import { toolExecutionEnvironment } from '../../goEnv';
+import { getTextEditForAddImport } from '../../goImport';
+import { promptForMissingTool, promptForUpdatingTool } from '../../goInstallTools';
+import { isModSupported } from '../../goModules';
+import { getImportablePackages, PackageInfo } from '../../goPackages';
 import {
 	byteOffsetAt,
 	getBinPath,
@@ -27,8 +27,8 @@ import {
 	isPositionInString,
 	parseFilePrelude,
 	runGodoc
-} from './util';
-import { getCurrentGoWorkspaceFromGOPATH } from './utils/pathUtils';
+} from '../../util';
+import { getCurrentGoWorkspaceFromGOPATH } from '../../utils/pathUtils';
 
 function vscodeKindFromGoCodeClass(kind: string, type: string): vscode.CompletionItemKind {
 	switch (kind) {