Merge 726082ba03 into caff604d95

CHANGELOG.md

@@ -12,9 +12,6 @@
 - `hilbish.notification` signal when a message/notification is sent
 - `notifyJobFinish` opt to send a notification when background jobs are
 completed.
-- Allow numbered arg substitutions in aliases.
-  - Example: `hilbish.alias('hello', 'echo %1 says hello')` allows the user to run `hello hilbish`
-  which will output `hilbish says hello`.
 
 [#219]: https://github.com/Rosettea/Hilbish/issues/219
 ### Fixed

aliases.go

@@ -1,8 +1,6 @@
 package main
 
 import (
-	"regexp"
-	"strconv"
 	"strings"
 	"sync"
 
@@ -48,27 +46,9 @@ func (a *aliasModule) Resolve(cmdstr string) string {
 	a.mu.RLock()
 	defer a.mu.RUnlock()
 
-	arg, _ := regexp.Compile(`[\\]?%\d+`)
-
-	args, _ := splitInput(cmdstr)
+	args := strings.Split(cmdstr, " ")
 	for a.aliases[args[0]] != "" {
 		alias := a.aliases[args[0]]
-		alias = arg.ReplaceAllStringFunc(alias, func(a string) string {
-			idx, _ := strconv.Atoi(a[1:])
-			if strings.HasPrefix(a, "\\") || idx == 0 {
-				return strings.TrimPrefix(a, "\\")
-			}
-
-			if idx + 1 > len(args) {
-				return a
-			}
-			val := args[idx]
-			args = cut(args, idx)
-			cmdstr = strings.Join(args, " ")
-
-			return val
-		})
-		
 		cmdstr = alias + strings.TrimPrefix(cmdstr, args[0])
 		cmdArgs, _ := splitInput(cmdstr)
 		args = cmdArgs

main.go

@@ -289,7 +289,7 @@ func removeDupes(slice []string) []string {
 
 func contains(s []string, e string) bool {
 	for _, a := range s {
-		if strings.ToLower(a) == strings.ToLower(e) {
+		if a == e {
 			return true
 		}
 	}
@@ -324,7 +324,3 @@ func getVersion() string {
 
 	return v.String()
 }
-
-func cut(slice []string, idx int) []string {
-	return append(slice[:idx], slice[idx + 1:]...)
-}