Merge pull request #20 from x1unix/dev

Release candidate - 1.5.0

Author: x1unix

README.md

@@ -11,15 +11,16 @@ Improved Go Playground powered by Monaco Editor and React
 
 * 💡 Code autocomplete
 * 💾 Load and save files
-* 🛠 [WebAssembly](https://github.com/golang/go/wiki/WebAssembly) support (see [latest release notes](https://github.com/x1unix/go-playground/releases/tag/v1.3.0))
+* 📔 Snippets and tutorials
+* 🛠 [WebAssembly](https://github.com/golang/go/wiki/WebAssembly) support
 * 🌚 Dark theme
 
 
 And more
 
 ## Demo
 
-[http://goplay.x1unix.com/](http://goplay.x1unix.com/)
+[http://goplay.tools/](goplay.tools)
 
 ## Installation
 
@@ -40,6 +41,13 @@ $ ./playground -f ./data/packages.json -debug
 
 Use `-help` to get information about command params
 
+### Third-party credits
+
+* Default playground run server provided by [play.golang.org](https://play.golang.org)
+* Code for templates and tutorials provided by [gobyexample.com](https://gobyexample.com/)
+* Code completion snippets were inspired by [tj/vscode-snippets](https://github.com/tj/vscode-snippets/blob/master/go.json)
+
+
 ## Contributors
 
 ### Code Contributors

build/Dockerfile

@@ -7,17 +7,17 @@ ARG GITHUB_URL=https://github.com/x1unix/go-playground
 RUN yarn install --silent && \
     REACT_APP_VERSION=$APP_VERSION REACT_APP_GITHUB_URL=$GITHUB_URL REACT_APP_GTAG=$APP_GTAG yarn build
 
-FROM golang:1.13-alpine as build
+FROM golang:1.14-alpine as build
 WORKDIR /tmp/playground
 COPY cmd ./cmd
 COPY pkg ./pkg
 COPY go.mod .
 COPY go.sum .
-RUN go build -o server ./cmd/playground && \
+RUN go build -o server -ldflags="-X 'main.Version=$APP_VERSION'" ./cmd/playground && \
     GOOS=js GOARCH=wasm go build -o ./worker.wasm ./cmd/webworker && \
     cp $(go env GOROOT)/misc/wasm/wasm_exec.js .
 
-FROM golang:1.13-alpine as production
+FROM golang:1.14-alpine as production
 WORKDIR /opt/playground
 ENV GOROOT /usr/local/go
 ENV APP_CLEAN_INTERVAL=10m

cmd/playground/main.go

@@ -18,6 +18,8 @@ import (
 	"go.uber.org/zap"
 )
 
+const Version = "testing"
+
 type appArgs struct {
 	packagesFile    string
 	addr            string
@@ -75,6 +77,7 @@ func start(goRoot string, args appArgs) error {
 		return fmt.Errorf("invalid cleanup interval parameter: %s", err)
 	}
 
+	zap.S().Info("Server version: ", Version)
 	zap.S().Infof("GOROOT is %q", goRoot)
 	zap.S().Infof("Packages file is %q", args.packagesFile)
 	zap.S().Infof("Cleanup interval is %s", cleanInterval.String())
@@ -94,7 +97,7 @@ func start(goRoot string, args appArgs) error {
 	go store.StartCleaner(ctx, cleanInterval, nil)
 
 	r := mux.NewRouter()
-	langserver.New(packages, compiler.NewBuildService(zap.S(), store)).
+	langserver.New(Version, packages, compiler.NewBuildService(zap.S(), store)).
 		Mount(r.PathPrefix("/api").Subrouter())
 	r.PathPrefix("/").Handler(langserver.SpaFileServer("./public"))
 

pkg/analyzer/package.go

@@ -50,6 +50,13 @@ func (p *Package) SymbolByChar(chr string) []*CompletionItem {
 	return append(p.Functions.Match(chr), result...)
 }
 
+func (p *Package) AllSymbols() []*CompletionItem {
+	out := make([]*CompletionItem, 0, p.Values.Len()+p.Functions.Len())
+	out = append(out, p.Functions.Symbols...)
+	out = append(out, p.Values.Symbols...)
+	return out
+}
+
 func (p *Package) GetCompletionItem() *CompletionItem {
 	return &CompletionItem{
 		Label:         p.Name,

pkg/analyzer/sym_index.go

@@ -6,6 +6,10 @@ type SymbolIndex struct {
 	charMap map[string][]*CompletionItem
 }
 
+func (si *SymbolIndex) Len() int {
+	return len(si.Symbols)
+}
+
 func emptySymbolIndex() SymbolIndex {
 	return SymbolIndex{
 		Symbols: []*CompletionItem{},

pkg/langserver/request.go

@@ -52,6 +52,14 @@ func (r *ErrorResponse) Write(w http.ResponseWriter) http.ResponseWriter {
 	return w
 }
 
+type VersionResponse struct {
+	Version string `json:"version"`
+}
+
+func (r VersionResponse) Write(w http.ResponseWriter) {
+	WriteJSON(w, r)
+}
+
 type SuggestionsResponse struct {
 	Suggestions []*analyzer.CompletionItem `json:"suggestions"`
 }

pkg/langserver/server.go

@@ -29,15 +29,17 @@ const (
 )
 
 type Service struct {
+	version  string
 	log      *zap.SugaredLogger
 	index    analyzer.PackageIndex
 	compiler compiler.BuildService
 	limiter  *rate.Limiter
 }
 
-func New(packages []*analyzer.Package, builder compiler.BuildService) *Service {
+func New(version string, packages []*analyzer.Package, builder compiler.BuildService) *Service {
 	return &Service{
 		compiler: builder,
+		version:  version,
 		log:      zap.S().Named("langserver"),
 		index:    analyzer.BuildPackageIndex(packages),
 		limiter:  rate.NewLimiter(rate.Every(frameTime), compileRequestsPerFrame),
@@ -46,6 +48,8 @@ func New(packages []*analyzer.Package, builder compiler.BuildService) *Service {
 
 // Mount mounts service on route
 func (s *Service) Mount(r *mux.Router) {
+	r.Path("/version").
+		HandlerFunc(WrapHandler(s.HandleGetVersion))
 	r.Path("/suggest").
 		HandlerFunc(WrapHandler(s.HandleGetSuggestion))
 	r.Path("/run").Methods(http.MethodPost).
@@ -83,10 +87,6 @@ func (s *Service) lookupBuiltin(val string) (*SuggestionsResponse, error) {
 }
 
 func (s *Service) provideSuggestion(req SuggestionRequest) (*SuggestionsResponse, error) {
-	if req.Value == "" {
-		return nil, fmt.Errorf("empty suggestion request value, nothing to provide")
-	}
-
 	// Provide package suggestions (if requested)
 	if req.PackageName != "" {
 		pkg, ok := s.index.PackageByName(req.PackageName)
@@ -98,14 +98,30 @@ func (s *Service) provideSuggestion(req SuggestionRequest) (*SuggestionsResponse
 			return nil, fmt.Errorf("failed to analyze package %q: %s", req.PackageName, err)
 		}
 
+		var symbols []*analyzer.CompletionItem
+		if req.Value != "" {
+			symbols = pkg.SymbolByChar(req.Value)
+		} else {
+			symbols = pkg.AllSymbols()
+		}
+
 		return &SuggestionsResponse{
-			Suggestions: pkg.SymbolByChar(req.Value),
+			Suggestions: symbols,
 		}, nil
 	}
 
+	if req.Value == "" {
+		return nil, fmt.Errorf("empty suggestion request value, nothing to provide")
+	}
+
 	return s.lookupBuiltin(req.Value)
 }
 
+func (s *Service) HandleGetVersion(w http.ResponseWriter, r *http.Request) error {
+	WriteJSON(w, VersionResponse{Version: s.version})
+	return nil
+}
+
 func (s *Service) HandleGetSuggestion(w http.ResponseWriter, r *http.Request) error {
 	q := r.URL.Query()
 	value := q.Get("value")

web/package.json

@@ -10,13 +10,13 @@
     "circular-dependency-plugin": "^5.2.0",
     "connected-react-router": "^6.6.1",
     "file-saver": "^2.0.2",
-    "monaco-editor": "^0.19.3",
-    "monaco-editor-webpack-plugin": "^1.8.2",
+    "monaco-editor": "^0.20.0",
+    "monaco-editor-webpack-plugin": "^1.9.0",
     "office-ui-fabric-react": "^7.82.1",
     "react": "^16.12.0",
     "react-app-rewired": "^2.1.5",
     "react-dom": "^16.12.0",
-    "react-monaco-editor": "^0.33.0",
+    "react-monaco-editor": "^0.39.1",
     "react-redux": "^7.1.3",
     "react-router-dom": "^5.1.2",
     "react-scripts": "3.3.0",
@@ -26,8 +26,8 @@
     "uuid": "^3.4.0"
   },
   "scripts": {
-    "start": "react-app-rewired start",
-    "build": "react-app-rewired build",
+    "start": "GENERATE_SOURCEMAP=true react-app-rewired start",
+    "build": "GENERATE_SOURCEMAP=false react-app-rewired build",
     "test": "react-app-rewired test",
     "eject": "react-app-rewired eject",
     "gen:suggestions": "node ./src/editor/internal/genpkgcache.js"