зеркало из https://github.com/golang/tools.git
fix compile err
This commit is contained in:
Родитель
5a830381a3
Коммит
f95ca66542
|
@ -16,12 +16,7 @@ import (
|
|||
func Options(options *settings.Options) {
|
||||
options.LicensesText = licensesText
|
||||
if options.GoDiff {
|
||||
switch options.NewDiff {
|
||||
case "new":
|
||||
options.ComputeEdits = diff.Strings
|
||||
default:
|
||||
options.ComputeEdits = BothDiffs
|
||||
}
|
||||
}
|
||||
options.URLRegexp = xurls.Relaxed()
|
||||
updateAnalyzers(options)
|
||||
|
|
|
@ -113,7 +113,6 @@ func DefaultOptions(overrides ...func(*Options)) *Options {
|
|||
CompleteUnimported: true,
|
||||
CompletionDocumentation: true,
|
||||
DeepCompletion: true,
|
||||
NewDiff: "new",
|
||||
SubdirWatchPatterns: SubdirWatchPatternsAuto,
|
||||
ReportAnalysisProgressAfter: 5 * time.Second,
|
||||
TelemetryPrompt: false,
|
||||
|
|
|
@ -525,12 +525,6 @@ type InternalOptions struct {
|
|||
// This option applies only during initialization.
|
||||
ShowBugReports bool
|
||||
|
||||
// NewDiff controls the choice of the new diff implementation. It can be
|
||||
// 'new', 'old', or 'both', which is the default. 'both' computes diffs with
|
||||
// both algorithms, checks that the new algorithm has worked, and write some
|
||||
// summary statistics to a file in os.TmpDir().
|
||||
NewDiff string
|
||||
|
||||
// SubdirWatchPatterns configures the file watching glob patterns registered
|
||||
// by gopls.
|
||||
//
|
||||
|
@ -1161,9 +1155,6 @@ func (o *Options) set(name string, value interface{}, seen map[string]struct{})
|
|||
// This setting should be handled before all of the other options are
|
||||
// processed, so do nothing here.
|
||||
|
||||
case "newDiff":
|
||||
result.setString(&o.NewDiff)
|
||||
|
||||
case "subdirWatchPatterns":
|
||||
if s, ok := result.asOneOf(
|
||||
string(SubdirWatchPatternsOn),
|
||||
|
|
Загрузка…
Ссылка в новой задаче