feat: Support config in user home path .codei18n

--story=1

Author: studyzy

adapters/rust/adapter.go

@@ -2,6 +2,7 @@ package rust
 
 import (
 	"context"
+	"os"
 
 	sitter "github.com/smacker/go-tree-sitter"
 	"github.com/smacker/go-tree-sitter/rust"
@@ -31,6 +32,14 @@ func (a *RustAdapter) Language() string {
 // It returns a list of domain.Comment structs containing comment text, position, and context symbol.
 // If src is nil, it currently expects the caller to handle file reading (TODO: implement file reading).
 func (a *RustAdapter) Parse(file string, src []byte) ([]*domain.Comment, error) {
+	if src == nil {
+		data, err := os.ReadFile(file)
+		if err != nil {
+			return nil, err
+		}
+		src = data
+	}
+
 	// Parse the source code using Tree-sitter
 	tree, err := a.parser.ParseCtx(context.Background(), nil, src)
 	if err != nil {

adapters/rust/extractor.go

@@ -32,6 +32,10 @@ func (a *RustAdapter) extractComments(root *sitter.Node, src []byte, file string
 			node := c.Node
 			content := node.Content(src)
 
+			if isEmptyComment(content) {
+				continue
+			}
+
 			// Find Owner and Symbol Path
 			owner := FindOwnerNode(node, src)
 			symbolPath := ResolveSymbolPath(owner, src)
@@ -67,3 +71,23 @@ func getDomainCommentType(content string) domain.CommentType {
 	}
 	return domain.CommentTypeLine
 }
+
+func isEmptyComment(content string) bool {
+	trimmed := strings.TrimSpace(content)
+	switch {
+	case strings.HasPrefix(trimmed, "///"):
+		return strings.TrimSpace(strings.TrimPrefix(trimmed, "///")) == ""
+	case strings.HasPrefix(trimmed, "//!"):
+		return strings.TrimSpace(strings.TrimPrefix(trimmed, "//!")) == ""
+	case strings.HasPrefix(trimmed, "//"):
+		return strings.TrimSpace(strings.TrimPrefix(trimmed, "//")) == ""
+	case strings.HasPrefix(trimmed, "/*"):
+		inner := strings.TrimPrefix(trimmed, "/*")
+		if strings.HasSuffix(inner, "*/") {
+			inner = strings.TrimSuffix(inner, "*/")
+		}
+		return strings.TrimSpace(inner) == ""
+	default:
+		return strings.TrimSpace(trimmed) == ""
+	}
+}

cmd/codei18n/root.go

@@ -3,6 +3,7 @@ package main
 import (
 	"fmt"
 	"os"
+	"path/filepath"
 
 	"github.com/spf13/cobra"
 	"github.com/spf13/viper"
@@ -37,7 +38,7 @@ func init() {
 	rootCmd.SetVersionTemplate("CodeI18n CLI 版本: {{.Version}}\n")
 
 	// Global flags
-	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "配置文件路径 (默认是 $HOME/.codei18n.json 或项目根目录 .codei18n/config.json)")
+	rootCmd.PersistentFlags().StringVar(&cfgFile, "config", "", "配置文件路径 (默认读取 ~/.codei18n/config.json 以及当前目录的 .codei18n/config.json)")
 	rootCmd.PersistentFlags().BoolVar(&verbose, "verbose", false, "显示详细日志")
 
 	// Bind flags to viper
@@ -46,31 +47,69 @@ func init() {
 
 // initConfig reads in config file and ENV variables if set.
 func initConfig() {
+	viper.AutomaticEnv() // read in environment variables that match
+
 	if cfgFile != "" {
-		// Use config file from the flag.
 		viper.SetConfigFile(cfgFile)
-	} else {
-		// Find home directory.
-		home, err := os.UserHomeDir()
-		if err != nil {
+		if err := viper.ReadInConfig(); err != nil {
 			cobra.CheckErr(err)
 		}
+		if verbose {
+			fmt.Fprintf(os.Stderr, "Using config file: %s\n", viper.ConfigFileUsed())
+		}
+		return
+	}
 
-		// Search config in home directory with name ".codei18n" (without extension).
-		viper.AddConfigPath(home)
-		viper.AddConfigPath(".codei18n")
-		viper.SetConfigType("json")
-		viper.SetConfigName("config")
+	home, err := os.UserHomeDir()
+	if err != nil {
+		cobra.CheckErr(err)
 	}
 
-	viper.AutomaticEnv() // read in environment variables that match
+	configLoaded := false
+
+	if loaded, err := loadConfigFile(filepath.Join(home, ".codei18n", "config.json"), false); err != nil {
+		cobra.CheckErr(err)
+	} else if loaded {
+		configLoaded = true
+	}
+
+	if loaded, err := loadConfigFile(filepath.Join(".codei18n", "config.json"), configLoaded); err != nil {
+		cobra.CheckErr(err)
+	} else if loaded {
+		configLoaded = true
+	}
+
+	if !configLoaded && verbose {
+		fmt.Fprintln(os.Stderr, "未找到配置文件，使用内置默认配置")
+	}
+}
 
-	// If a config file is found, read it in.
-	if err := viper.ReadInConfig(); err == nil && verbose {
-		fmt.Fprintf(os.Stderr, "Using config file: %s\n", viper.ConfigFileUsed())
+func loadConfigFile(path string, merge bool) (bool, error) {
+	if _, err := os.Stat(path); err != nil {
+		if os.IsNotExist(err) {
+			return false, nil
+		}
+		return false, err
 	}
+
+	viper.SetConfigFile(path)
+
+	var err error
+	if merge {
+		err = viper.MergeInConfig()
+	} else {
+		err = viper.ReadInConfig()
+	}
+	if err != nil {
+		return false, err
+	}
+
+	if verbose {
+		fmt.Fprintf(os.Stderr, "Using config file: %s\n", path)
+	}
+	return true, nil
 }
 
 func main() {
 	Execute()
-}
+}

core/mapping/store.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"os"
 	"path/filepath"
+	"strings"
 	"sync"
 
 	"github.com/studyzy/codei18n/core/domain"
@@ -99,7 +100,8 @@ func (s *Store) Set(id, lang, text string) {
 	if _, ok := s.mapping.Comments[id]; !ok {
 		s.mapping.Comments[id] = make(map[string]string)
 	}
-	s.mapping.Comments[id][lang] = text
+	cleanText := strings.TrimRight(text, "\r\n")
+	s.mapping.Comments[id][lang] = cleanText
 }
 
 // GetMapping returns the underlying mapping object (read-only copy recommended for complex ops)