Merge pull request #1797 from xushiwei/q

ClassNameAndExt: use global replacer
goplus · Mar 8, 2024 · 40d509f · 40d509f
2 parents 27e61bc + 0b4db18
commit 40d509f
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/cl/classfile.go b/cl/classfile.go
@@ -71,12 +71,16 @@ func (p *gmxProject) getScheds(cb *gox.CodeBuilder) []goast.Stmt {
 	return p.schedStmts
 }
 
+var (
+	repl = strings.NewReplacer(":", "", "#", "", "-", "_", ".", "_")
+)
+
 func ClassNameAndExt(file string) (name, clsfile, ext string) {
 	fname := filepath.Base(file)
 	clsfile, ext = modfile.SplitFname(fname)
 	name = clsfile
-	if strings.ContainsAny(name, ":-.") {
-		name = strings.NewReplacer(":", "", "-", "_", ".", "_").Replace(name)
+	if strings.ContainsAny(name, ":#-.") {
+		name = repl.Replace(name)
 	}
 	return
 }