gopls/v0.13.2 fixed

goplus · Oct 16, 2023 · b8078ad · b8078ad
1 parent a6a9e28
commit b8078ad
Show file tree

Hide file tree

Showing 55 changed files with 100 additions and 3 deletions.
diff --git a/go/analysis/unitchecker/export_test.go b/go/analysis/unitchecker/export_test.go
@@ -4,6 +4,7 @@
 
 package unitchecker
 
+/*
 import (
 	"go/token"
 	"go/types"
@@ -24,3 +25,4 @@ func SetTypeImportExport(
 	makeTypesImporter = MakeTypesImporter
 	exportTypes = ExportTypes
 }
+*/
diff --git a/go/analysis/unitchecker/separate_test.go b/go/analysis/unitchecker/separate_test.go
@@ -7,7 +7,7 @@
 package unitchecker_test
 
 // This file illustrates separate analysis with an example.
-
+/*
 import (
 	"bytes"
 	"encoding/json"
@@ -309,3 +309,4 @@ func extractTxtar(ar *txtar.Archive, dir string) error {
 	}
 	return nil
 }
+*/
diff --git a/gopls/goxls/cmd/goxls/goxls_app.go b/gopls/goxls/cmd/goxls/goxls_app.go
@@ -7,5 +7,5 @@ package main
 import "golang.org/x/tools/gopls/goxls"
 
 func main() {
-	goxls.Main(nil, nil)
+	goxls.Main()
 }
diff --git a/gopls/goxls/goxls.go b/gopls/goxls/goxls.go
@@ -4,6 +4,7 @@
 
 package goxls
 
+/*
 import (
 	"context"
 	"io"
@@ -21,3 +22,17 @@ func Main(in io.ReadCloser, out io.WriteCloser) {
 	app.Serve.Out = out
 	tool.Main(ctx, app, os.Args[1:])
 }
+*/
+import (
+	"context"
+	"os"
+
+	"golang.org/x/tools/gopls/internal/hooks"
+	"golang.org/x/tools/gopls/internal/lsp/cmd"
+	"golang.org/x/tools/internal/tool"
+)
+
+func Main() {
+	ctx := context.Background()
+	tool.Main(ctx, cmd.New("goxls", "", nil, hooks.Options), os.Args[1:])
+}
diff --git a/gopls/internal/goxls/astutil/astutil.go → gopls/internal/_goxls/astutil/astutil.go b/gopls/internal/goxls/astutil/astutil.go → gopls/internal/_goxls/astutil/astutil.go
diff --git a/gopls/internal/goxls/astutil/purge.go → gopls/internal/_goxls/astutil/purge.go b/gopls/internal/goxls/astutil/purge.go → gopls/internal/_goxls/astutil/purge.go
diff --git a/gopls/internal/goxls/goputil/goputil.go → gopls/internal/_goxls/goputil/goputil.go b/gopls/internal/goxls/goputil/goputil.go → gopls/internal/_goxls/goputil/goputil.go
diff --git a/gopls/internal/goxls/packages/gengo.go → gopls/internal/_goxls/packages/gengo.go b/gopls/internal/goxls/packages/gengo.go → gopls/internal/_goxls/packages/gengo.go
diff --git a/gopls/internal/goxls/packages/packages.go → gopls/internal/_goxls/packages/packages.go b/gopls/internal/goxls/packages/packages.go → gopls/internal/_goxls/packages/packages.go
diff --git a/...s/internal/goxls/packagesinternal/pkgs.go → .../internal/_goxls/packagesinternal/pkgs.go b/...s/internal/goxls/packagesinternal/pkgs.go → .../internal/_goxls/packagesinternal/pkgs.go
diff --git a/.../internal/goxls/parserutil/parser_util.go → ...internal/_goxls/parserutil/parser_util.go b/.../internal/goxls/parserutil/parser_util.go → ...internal/_goxls/parserutil/parser_util.go
diff --git a/gopls/internal/goxls/typeparams/normalize.go → ...s/internal/_goxls/typeparams/normalize.go b/gopls/internal/goxls/typeparams/normalize.go → ...s/internal/_goxls/typeparams/normalize.go
diff --git a/...s/internal/goxls/typeparams/typeparams.go → .../internal/_goxls/typeparams/typeparams.go b/...s/internal/goxls/typeparams/typeparams.go → .../internal/_goxls/typeparams/typeparams.go
diff --git a/gopls/internal/goxls/typesutil/eval.go → gopls/internal/_goxls/typesutil/eval.go b/gopls/internal/goxls/typesutil/eval.go → gopls/internal/_goxls/typesutil/eval.go
diff --git a/gopls/internal/goxls/typesutil/typesutil.go → gopls/internal/_goxls/typesutil/typesutil.go b/gopls/internal/goxls/typesutil/typesutil.go → gopls/internal/_goxls/typesutil/typesutil.go
diff --git a/gopls/internal/lsp/cache/filemap.go b/gopls/internal/lsp/cache/filemap.go
@@ -4,6 +4,7 @@
 
 package cache
 
+/*
 import (
 	"path/filepath"
 
@@ -149,3 +150,4 @@ func (m *fileMap) Dirs() *persistent.Set[string] {
 	}
 	return m.dirs
 }
+*/
diff --git a/gopls/internal/lsp/cache/filemap_test.go b/gopls/internal/lsp/cache/filemap_test.go
@@ -4,6 +4,7 @@
 
 package cache
 
+/*
 import (
 	"path/filepath"
 	"sort"
@@ -106,3 +107,4 @@ func TestFileMap(t *testing.T) {
 		})
 	}
 }
+*/
diff --git a/gopls/internal/lsp/cache/parse_cache_gox.go b/gopls/internal/lsp/cache/parse_cache_gox.go
@@ -4,6 +4,7 @@
 
 package cache
 
+/*
 import (
 	"bytes"
 	"container/heap"
@@ -205,3 +206,4 @@ func (c *parseCache) parseGopFiles(ctx context.Context, fset *token.FileSet, mod
 
 	return pgfs, firstErr
 }
+*/
diff --git a/gopls/internal/lsp/cache/parse_gox.go b/gopls/internal/lsp/cache/parse_gox.go
@@ -4,6 +4,7 @@
 
 package cache
 
+/*
 import (
 	"context"
 	"fmt"
@@ -157,3 +158,4 @@ func fixGopAST(n ast.Node, tok *token.File, src []byte) (fixes []fixType) {
 func fixGopSrc(f *ast.File, tf *token.File, src []byte) (newSrc []byte, fix fixType) {
 	return nil, noFix
 }
+*/
diff --git a/gopls/internal/lsp/cache/pkg_gox.go b/gopls/internal/lsp/cache/pkg_gox.go
@@ -4,6 +4,7 @@
 
 package cache
 
+/*
 import (
 	"fmt"
 
@@ -29,3 +30,4 @@ func (pkg *syntaxPackage) GopFile(uri span.URI) (*source.ParsedGopFile, error) {
 	}
 	return nil, fmt.Errorf("no parsed file for %s in %v", uri, pkg.id)
 }
+*/
diff --git a/gopls/internal/lsp/cache/snapshot_gox.go b/gopls/internal/lsp/cache/snapshot_gox.go
@@ -4,6 +4,7 @@
 
 package cache
 
+/*
 import (
 	"golang.org/x/tools/gopls/internal/goxls/goputil"
 	"golang.org/x/tools/gopls/internal/lsp/source"
@@ -12,3 +13,4 @@ import (
 func checkGopFile(fh source.FileHandle, fext string) bool {
 	return goputil.FileKind(fext) != 0
 }
+*/
diff --git a/gopls/internal/lsp/cmd/serve_gox.go b/gopls/internal/lsp/cmd/serve_gox.go
@@ -4,6 +4,7 @@
 
 package cmd
 
+/*
 import (
 	"io"
 	"os"
@@ -22,3 +23,4 @@ func (s *Serve) reqOut() io.WriteCloser {
 	}
 	return os.Stdout
 }
+*/
diff --git a/gopls/internal/lsp/prompt.go b/gopls/internal/lsp/prompt.go
@@ -4,6 +4,7 @@
 
 package lsp
 
+/*
 import (
 	"context"
 	"fmt"
@@ -315,3 +316,4 @@ func acquireLockFile(path string) (func(), bool, error) {
 	}
 	return release, true, nil
 }
+*/
diff --git a/gopls/internal/lsp/prompt_test.go b/gopls/internal/lsp/prompt_test.go
@@ -4,6 +4,7 @@
 
 package lsp
 
+/*
 import (
 	"path/filepath"
 	"sync"
@@ -80,3 +81,4 @@ func TestReleaseAndAcquireFileLock(t *testing.T) {
 		t.Fatalf("failed to Acquire")
 	}
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/builtin_gox.go b/gopls/internal/lsp/source/completion/builtin_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"context"
 	"go/types"
@@ -146,3 +147,4 @@ func (c *gopCompleter) builtinArgType(obj types.Object, call *ast.CallExpr, pare
 
 	return inf
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/completion_gox.go b/gopls/internal/lsp/source/completion/completion_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"context"
 	"fmt"
@@ -2515,3 +2516,4 @@ func gopForEachPackageMember(content []byte, f func(tok token.Token, id *ast.Ide
 		}
 	}
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/deep_completion_gox.go b/gopls/internal/lsp/source/completion/deep_completion_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"context"
 	"go/types"
@@ -105,3 +106,4 @@ func (c *gopCompleter) objChainMatches(cand *candidate, chain []types.Object) bo
 
 	return true
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/definition_gox.go b/gopls/internal/lsp/source/completion/definition_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"go/types"
 	"strings"
@@ -97,3 +98,4 @@ func gopDefinition(path []ast.Node, obj types.Object, pgf *source.ParsedGopFile)
 	}
 	return ans, sel
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/format_gox.go b/gopls/internal/lsp/source/completion/format_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"context"
 	"fmt"
@@ -337,3 +338,4 @@ func (c *gopCompleter) importEdits(imp *importInfo) ([]protocol.TextEdit, error)
 		FixType: imports.AddImport,
 	})
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/fuzz_gox.go b/gopls/internal/lsp/source/completion/fuzz_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"fmt"
 	"go/types"
@@ -134,3 +135,4 @@ Loop:
 	// let the standard processing take care of it instead
 	return false
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/keywords_gox.go b/gopls/internal/lsp/source/completion/keywords_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"github.com/goplus/gop/ast"
 	"golang.org/x/tools/gopls/internal/lsp/protocol"
@@ -123,3 +124,4 @@ func (c *gopCompleter) addKeywordItems(seen map[string]bool, score float64, kws
 		}
 	}
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/labels_gox.go b/gopls/internal/lsp/source/completion/labels_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 // wantLabelCompletion returns true if we want (only) label
 // completions at the position.
 func (c *gopCompleter) wantLabelCompletion() labelType {
@@ -16,3 +17,4 @@ func (c *gopCompleter) wantLabelCompletion() labelType {
 func (c *gopCompleter) labels(lt labelType) {
 	panic("todo")
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/literal_gox.go b/gopls/internal/lsp/source/completion/literal_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"context"
 	"fmt"
@@ -521,3 +522,4 @@ func (c *gopCompleter) typeParamInScope(tp *typeparams.TypeParam) bool {
 	_, foundObj := scope.LookupParent(obj.Name(), c.pos)
 	return obj == foundObj
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/package_gox.go b/gopls/internal/lsp/source/completion/package_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"context"
 	"errors"
@@ -33,3 +34,4 @@ func (c *gopCompleter) packageNameCompletions(ctx context.Context, fileURI span.
 	}
 	return nil
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/postfix_snippets_gox.go b/gopls/internal/lsp/source/completion/postfix_snippets_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"context"
 	"fmt"
@@ -168,3 +169,4 @@ func (c *gopCompleter) importIfNeeded(pkgPath string, scope *types.Scope) (strin
 
 	return defaultName, edits, nil
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/printf_gox.go b/gopls/internal/lsp/source/completion/printf_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"go/constant"
 	"go/types"
@@ -47,3 +48,4 @@ func gopPrintfArgKind(info *typesutil.Info, call *ast.CallExpr, argIdx int) objK
 
 	return formatOperandKind(constant.StringVal(strArg), argIdx-(numParams-1)+1)
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/snippet_gox.go b/gopls/internal/lsp/source/completion/snippet_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"github.com/goplus/gop/ast"
 	"golang.org/x/tools/gopls/internal/lsp/safetoken"
@@ -118,3 +119,4 @@ func (c *gopCompleter) functionCallSnippet(name string, tparams, params []string
 
 	snip.WriteText(")")
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/statements_gox.go b/gopls/internal/lsp/source/completion/statements_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"fmt"
 	"go/types"
@@ -359,3 +360,4 @@ func gopGetTestVar(enclosingFunc *gopFuncInfo, pkg source.Package) string {
 
 	return ""
 }
+*/
diff --git a/gopls/internal/lsp/source/completion/util_gox.go b/gopls/internal/lsp/source/completion/util_gox.go
@@ -4,6 +4,7 @@
 
 package completion
 
+/*
 import (
 	"go/types"
 
@@ -124,3 +125,4 @@ func (c *gopCompleter) editText(from, to token.Pos, newText string) ([]protocol.
 		New:   newText,
 	}})
 }
+*/
diff --git a/gopls/internal/lsp/source/format_gox.go b/gopls/internal/lsp/source/format_gox.go
@@ -4,6 +4,7 @@
 
 package source
 
+/*
 import (
 	"bytes"
 	"context"
@@ -105,3 +106,4 @@ func isClass(fh FileHandle) bool {
 	fext := filepath.Ext(fh.URI().Filename())
 	return goputil.FileKind(fext) == goputil.FileGopClass
 }
+*/
diff --git a/gopls/internal/lsp/source/highlight_gox.go b/gopls/internal/lsp/source/highlight_gox.go
@@ -4,6 +4,7 @@
 
 package source
 
+/*
 import (
 	"go/types"
 
@@ -23,3 +24,4 @@ func GopImportedPkgName(info *typesutil.Info, imp *ast.ImportSpec) (*types.PkgNa
 	pkgname, ok := obj.(*types.PkgName)
 	return pkgname, ok
 }
+*/