Update: minor rules

Hiroki Konishi · Hiroki Konishi · commit a0644f19bb51 · 2019-09-30T09:50:18.000+09:00
diff --git a/rules/git_pmy_rules.json b/rules/git_pmy_rules.json
@@ -51,7 +51,7 @@
     "cmdGroups": [
       {
         "tag": "🌱:branch",
-        "stmt": "git branch --format=\"%(refname:short)\" | grep feature/",
+        "stmt": "git branch --format=\"%(refname:short)\" | egrep -v \"(master|develop|dev)\"",
         "after": "awk '{print $0}'"
       }
     ],
diff --git a/rules/pmy_rules.json b/rules/pmy_rules.json
@@ -36,23 +36,23 @@
     "regexpLeft": "^(?P<body>.*?)(?P<path>~{0,1}([0-9A-Za-z_\\-.]*/)+)(?P<query>[0-9A-Za-z_\\-.]*)$",
     "cmdGroups": [
       {
-        "stmt":  "command ls -AF -1 <path>",
+        "stmt":  "command ls -AF -1 <path> | rg --color always \"<query>\"",
         "after": "awk '{print $0}'"
       }
     ],
-    "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"^<query> \"",
+    "fuzzyFinderCmd": "fzf -0 -1 --ansi",
     "bufferLeft": "<body><path>",
     "bufferRight": "[]"
   },
   {
     "regexpLeft": "^(?P<body>.*?) (?P<query>[0-9A-Za-z_\\-.]*)$",
     "cmdGroups": [
       {
-        "stmt":  "command ls -AF -1",
+        "stmt":  "command ls -AF -1 | rg --color always \"<query>\"",
         "after": "awk '{print $0}'"
       }
     ],
-    "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"^<query> \"",
+    "fuzzyFinderCmd": "fzf -0 -1 --ansi",
     "bufferLeft": "<body> ",
     "bufferRight": "[]"
   }
diff --git a/src/core.go b/src/core.go
@@ -41,12 +41,12 @@ func Run(cfgPath string, in Input) string {
 		log.Fatal(err)
 	}
 
+	// Load command specific rules from config file
 	if cmdName := in.getCmdName(); cmdName != "" {
 		cmdCfgPath := filepath.Join(
 			filepath.Dir(cfgPath),
 			fmt.Sprintf("%v_%v", cmdName, filepath.Base(cfgPath)),
 		)
-		// Load command specific rules from config file
 		cmdRules, err := loadAllRules(cmdCfgPath)
 		if err == nil {
 			rules = append(cmdRules, rules...)

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@`
`51`	`51`	`"cmdGroups": [`
`52`	`52`	`{`
`53`	`53`	`"tag": "🌱:branch",`
`54`		`- "stmt": "git branch --format=\"%(refname:short)\" \| grep feature/",`
	`54`	`+ "stmt": "git branch --format=\"%(refname:short)\" \| egrep -v \"(master\|develop\|dev)\"",`
`55`	`55`	`"after": "awk '{print $0}'"`
`56`	`56`	`}`
`57`	`57`	`],`
Original file line number	Diff line number	Diff line change
`@@ -36,23 +36,23 @@`
`36`	`36`	`"regexpLeft": "^(?P<body>.?)(?P<path>~{0,1}([0-9A-Za-z_\\-.]/)+)(?P<query>[0-9A-Za-z_\\-.]*)$",`
`37`	`37`	`"cmdGroups": [`
`38`	`38`	`{`
`39`		`- "stmt": "command ls -AF -1 <path>",`
	`39`	`+ "stmt": "command ls -AF -1 <path> \| rg --color always \"<query>\"",`
`40`	`40`	`"after": "awk '{print $0}'"`
`41`	`41`	`}`
`42`	`42`	`],`
`43`		`- "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"^<query> \"",`
	`43`	`+ "fuzzyFinderCmd": "fzf -0 -1 --ansi",`
`44`	`44`	`"bufferLeft": "<body><path>",`
`45`	`45`	`"bufferRight": "[]"`
`46`	`46`	`},`
`47`	`47`	`{`
`48`	`48`	`"regexpLeft": "^(?P<body>.?) (?P<query>[0-9A-Za-z_\\-.])$",`
`49`	`49`	`"cmdGroups": [`
`50`	`50`	`{`
`51`		`- "stmt": "command ls -AF -1",`
	`51`	`+ "stmt": "command ls -AF -1 \| rg --color always \"<query>\"",`
`52`	`52`	`"after": "awk '{print $0}'"`
`53`	`53`	`}`
`54`	`54`	`],`
`55`		`- "fuzzyFinderCmd": "fzf -0 -1 --ansi -q \"^<query> \"",`
	`55`	`+ "fuzzyFinderCmd": "fzf -0 -1 --ansi",`
`56`	`56`	`"bufferLeft": "<body> ",`
`57`	`57`	`"bufferRight": "[]"`
`58`	`58`	`}`
Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,12 @@ func Run(cfgPath string, in Input) string {`
`41`	`41`	`log.Fatal(err)`
`42`	`42`	`}`
`43`	`43`
	`44`	`+ // Load command specific rules from config file`
`44`	`45`	`if cmdName := in.getCmdName(); cmdName != "" {`
`45`	`46`	`cmdCfgPath := filepath.Join(`
`46`	`47`	`filepath.Dir(cfgPath),`
`47`	`48`	`fmt.Sprintf("%v_%v", cmdName, filepath.Base(cfgPath)),`
`48`	`49`	`)`
`49`		`- // Load command specific rules from config file`
`50`	`50`	`cmdRules, err := loadAllRules(cmdCfgPath)`
`51`	`51`	`if err == nil {`
`52`	`52`	`rules = append(cmdRules, rules...)`