sync margo

Author: DisposaBoy

src/margo.sh/Gopkg.lock

@@ -1,3 +1,11 @@
+required = [
+	"golang.org/x/tools/cmd/guru"
+]
+
+[prune]
+  go-tests = true
+  unused-packages = true
+
 [[constraint]]
   name = "github.com/ugorji/go"
   branch = "master"
@@ -10,6 +18,6 @@
   branch = "master"
   name = "golang.org/x/crypto"
 
-[prune]
-  go-tests = true
-  unused-packages = true
+[[constraint]]
+  branch = "master"
+  name = "golang.org/x/tools"

src/margo.sh/Gopkg.toml

@@ -33,7 +33,7 @@ func Main() {
 			return mgcli.Error("agent creation failed:", err)
 		}
 
-		ag.Store.EditorConfig(sublime.DefaultConfig)
+		ag.Store.SetBaseConfig(sublime.DefaultConfig)
 		if margoExt != nil {
 			margoExt(ag.Args())
 		}

src/margo.sh/cmdpkg/margosublime/main.go

@@ -12,12 +12,12 @@ func Margo(ma mg.Args) {
 	// they are run in the specified order
 	// and should ideally not block for more than a couple milliseconds
 	ma.Store.Use(
-		// by default, events (e.g. ViewSaved) are triggered in all files
-		// uncomment the reducer below to restict event to Go(-lang) files
-		// please note, however, that this mode is not tested
+		// By default, events (e.g. ViewSaved) are triggered in all files.
+		// Uncomment the reducer below to restict events to Go(-lang) files.
+		// Please note, however, that this mode is not tested
 		// and saving a non-go file will not trigger linters, etc. for that go pkg
 		//
-		// mg.Reduce(func(mx *mg.Ctx) *mg.State {
+		// mg.NewReducer(func(mx *mg.Ctx) *mg.State {
 		// 	return mx.SetConfig(mx.Config.EnabledForLangs("go"))
 		// }),
 

src/margo.sh/extension-example/extension-example.go

@@ -19,22 +19,20 @@ type FmtFunc struct {
 	Fmt func(mx *mg.Ctx, src []byte) ([]byte, error)
 
 	// Langs is the list of languages in which the reducer should run
-	Langs []string
+	Langs []mg.Lang
 
-	// Actions is a list of additional actions on which the reducer is allowed to run.
+	// Actions is a list of actions on which the reducer is allowed to run.
 	// The reducer always runs on the ViewFmt action, even if this list is empty.
 	Actions []mg.Action
 }
 
+// ReducerCond returns true if Langs and Actions matches the Ctx
+func (ff FmtFunc) ReducerCond(mx *mg.Ctx) bool {
+	return mx.ActionIs(ff.Actions...) && mx.LangIs(ff.Langs...)
+}
+
 // Reduce implements the FmtFunc reducer.
 func (ff FmtFunc) Reduce(mx *mg.Ctx) *mg.State {
-	if !mx.LangIs(ff.Langs...) {
-		return mx.State
-	}
-	if !mx.ActionIs(mg.ViewFmt{}) && !mx.ActionIs(ff.Actions...) {
-		return mx.State
-	}
-
 	fn := mx.View.Filename()
 	src, err := mx.View.ReadAll()
 	if err != nil {
@@ -48,7 +46,7 @@ func (ff FmtFunc) Reduce(mx *mg.Ctx) *mg.State {
 	if err != nil {
 		return mx.AddErrorf("failed to fmt %s: %s\n", fn, err)
 	}
-	return mx.SetSrc(src)
+	return mx.SetViewSrc(src)
 }
 
 // FmtCmd is wrapper around FmtFunc for generic fmt commands.
@@ -66,9 +64,9 @@ type FmtCmd struct {
 	Env mg.EnvMap
 
 	// Langs is the list of languages in which the reducer should run
-	Langs []string
+	Langs []mg.Lang
 
-	// Actions is a list of additional actions on which the reducer is allowed to run.
+	// Actions is a list of actions on which the reducer is allowed to run.
 	// The reducer always runs on the ViewFmt action, even if this list is empty.
 	Actions []mg.Action
 }

src/margo.sh/format/format.go

@@ -1,10 +1,10 @@
 package golang
 
 import (
-	"margo.sh/mg"
 	"go/ast"
 	"go/build"
 	"go/token"
+	"margo.sh/mg"
 	"os"
 	"path/filepath"
 	"reflect"
@@ -14,12 +14,12 @@ import (
 	"unicode/utf8"
 )
 
-var (
-	CommonPatterns = append([]*regexp.Regexp{
+func init() {
+	mg.AddCommonPatterns(mg.Go,
 		regexp.MustCompile(`^\s*(?P<path>.+?\.\w+):(?P<line>\d+:)(?P<column>\d+:?)?(?:(?P<tag>warning|error)[:])?(?P<message>.+?)(?: [(](?P<label>[-\w]+)[)])?$`),
 		regexp.MustCompile(`(?P<message>can't load package: package .+: found packages .+ \((?P<path>.+?\.go)\).+)`),
-	}, mg.CommonPatterns...)
-)
+	)
+}
 
 func BuildContext(mx *mg.Ctx) *build.Context {
 	c := build.Default

src/margo.sh/golang/common.go

@@ -115,7 +115,7 @@ func (gc *GoCmd) playTempDir(bx *mg.BultinCmdCtx) (newBx *mg.BultinCmdCtx, tDir
 		return bx, "", "", fmt.Errorf("cannot MkTempDir: %s", err)
 	}
 
-	if !bx.LangIs("go") {
+	if !bx.LangIs(mg.Go) {
 		return bx, tDir, "", nil
 	}
 
@@ -202,7 +202,7 @@ func newGoCmdCtx(bx *mg.BultinCmdCtx, label, cancelID string, tDir, tFn string)
 
 	gx.iw = &mg.IssueWriter{
 		Base:     mg.Issue{Label: label},
-		Patterns: CommonPatterns,
+		Patterns: bx.CommonPatterns(),
 		Dir:      gx.pkgDir,
 	}
 
@@ -240,6 +240,6 @@ func (gx *goCmdCtx) run(origView *mg.View) error {
 		ik.Dir = origView.Dir()
 	}
 
-	gx.Store.Dispatch(mg.StoreIssues{Key: ik, Issues: issues})
+	gx.Store.Dispatch(mg.StoreIssues{IssueKey: ik, Issues: issues})
 	return err
 }

src/margo.sh/golang/gocmd.go

@@ -11,7 +11,7 @@ import (
 	"io"
 	"margo.sh/golang/internal/gocode"
 	"margo.sh/mg"
-	"margo.sh/misc/pf"
+	"margo.sh/mgpf"
 	"margo.sh/sublime"
 	"strings"
 	"time"
@@ -71,7 +71,13 @@ func (g *Gocode) ReducerConfig(mx *mg.Ctx) mg.EditorConfig {
 		return nil
 	}
 
+	// ST might query the GoSublime plugin first, so we must always disable it
 	cfg = cfg.DisableGsComplete()
+	// but we don't want to affect editor completions in non-go files
+	if !g.ReducerCond(mx) {
+		return cfg
+	}
+
 	if !g.AllowExplicitCompletions {
 		cfg = cfg.InhibitExplicitCompletions()
 	}
@@ -82,7 +88,7 @@ func (g *Gocode) ReducerConfig(mx *mg.Ctx) mg.EditorConfig {
 }
 
 func (g *Gocode) ReducerCond(mx *mg.Ctx) bool {
-	return mx.LangIs("go") && mx.ActionIs(mg.QueryCompletions{})
+	return mx.ActionIs(mg.QueryCompletions{}) && mx.LangIs(mg.Go)
 }
 
 func (g *Gocode) ReducerMount(mx *mg.Ctx) {
@@ -116,7 +122,7 @@ func (g *Gocode) Reduce(mx *mg.Ctx) *mg.State {
 	select {
 	case g.reqs <- gr:
 	case <-time.After(qTimeout):
-		mx.Log.Println("gocode didn't accept the request after", pf.D(time.Since(start)))
+		mx.Log.Println("gocode didn't accept the request after", mgpf.D(time.Since(start)))
 		return st
 	}
 
@@ -131,10 +137,10 @@ func (g *Gocode) Reduce(mx *mg.Ctx) *mg.State {
 	case <-time.After(pTimeout):
 		go func() {
 			<-gr.res
-			mx.Log.Println("gocode eventually responded after", pf.Since(start))
+			mx.Log.Println("gocode eventually responded after", mgpf.Since(start))
 		}()
 
-		mx.Log.Println("gocode didn't respond after", pf.D(pTimeout), "taking", pf.Since(start))
+		mx.Log.Println("gocode didn't respond after", mgpf.D(pTimeout), "taking", mgpf.Since(start))
 		return st
 	}
 }

src/margo.sh/golang/gocode.go

@@ -27,7 +27,7 @@ type GocodeCalltips struct {
 }
 
 func (gc *GocodeCalltips) ReducerCond(mx *mg.Ctx) bool {
-	return mx.LangIs("go")
+	return mx.LangIs(mg.Go)
 }
 
 func (gc *GocodeCalltips) ReducerMount(mx *mg.Ctx) {

src/margo.sh/golang/gocode_calltips.go

@@ -10,6 +10,12 @@ import (
 var (
 	GoFmt     mg.Reducer = mg.NewReducer(goFmt)
 	GoImports mg.Reducer = mg.NewReducer(goImports)
+
+	commonFmtLangs   = []mg.Lang{mg.Go}
+	commonFmtActions = []mg.Action{
+		mg.ViewFmt{},
+		mg.ViewPreSave{},
+	}
 )
 
 func disableGsFmt(st *mg.State) *mg.State {
@@ -24,8 +30,8 @@ type FmtFunc func(mx *mg.Ctx, src []byte) ([]byte, error)
 func (ff FmtFunc) Reduce(mx *mg.Ctx) *mg.State {
 	return disableGsFmt(mgformat.FmtFunc{
 		Fmt:     ff,
-		Langs:   []string{"go"},
-		Actions: []mg.Action{mg.ViewPreSave{}},
+		Langs:   commonFmtLangs,
+		Actions: commonFmtActions,
 	}.Reduce(mx))
 }
 
@@ -39,7 +45,7 @@ func goImports(mx *mg.Ctx) *mg.State {
 	return disableGsFmt(mgformat.FmtCmd{
 		Name:    "goimports",
 		Args:    []string{"-srcdir", mx.View.Filename()},
-		Langs:   []string{"go"},
-		Actions: []mg.Action{mg.ViewPreSave{}},
+		Langs:   commonFmtLangs,
+		Actions: commonFmtActions,
 	}.Reduce(mx))
 }