fix(loadINI): use standard shadow loading

Instead of appending configurations directly we should use the common
shadow loading functions we've defined. This allows paths to be expanded
properly ahead of time, and still use the shadow processing mechanisms
other mechanisms expect.

This also enforces the load order through the list of sources built and
passed to processSources.

Signed-off-by: Randolph Sapp <rs@ti.com>

Author: StaticRocket

internal/core/source.go

@@ -100,11 +100,25 @@ func loadStdin(src string, cfg *Config, dry bool) (*ini.File, error) {
 }
 
 func loadINI(cfg *Config, dry bool) (*ini.File, error) {
-	uCfg := ini.Empty(ini.LoadOptions{
-		AllowShadows:             true,
-		Loose:                    true,
-		SpaceBeforeInlineComment: true,
-	})
+	var sources []string
+	var uCfg *ini.File
+
+	// NOTE: In v3.0, we now use the user's config directory as the default
+	// location.
+	//
+	// This is different from the other config-defining options (`--config`,
+	// `VALE_CONFIG_PATH`, etc.) in that it's loaded in addition to, rather
+	// than instead of, any other configuration sources.
+	//
+	// In other words, this config file is *always* loaded and is read after
+	// any other sources to allow for project-agnostic customization.
+	defaultCfg, _ := DefaultConfig()
+
+	if system.FileExists(defaultCfg) && !cfg.Flags.IgnoreGlobal && !dry {
+		sources = append(sources, defaultCfg)
+		cfg.Flags.Local = true
+		cfg.AddConfigFile(defaultCfg)
+	}
 
 	base, err := loadConfig(configNames)
 	if err != nil {
@@ -115,71 +129,37 @@ func loadINI(cfg *Config, dry bool) (*ini.File, error) {
 	if cfg.Flags.Sources != "" {
 		// NOTE: This case shouldn't be accessible from the CLI, but it can
 		// still be triggered by packages that include config files.
-		var sources []string
 
 		for _, source := range strings.Split(cfg.Flags.Sources, ",") {
 			abs, _ := filepath.Abs(source)
 			sources = append(sources, abs)
 		}
-
-		// We have multiple sources -- e.g., local config + remote package(s).
-		//
-		// See fixtures/config.feature#451 for an explanation of how this has
-		// changed since Vale Server was deprecated.
-		uCfg, err = processSources(cfg, sources)
-		if err != nil {
-			return nil, NewE100("config pipeline failed", err)
-		}
 	} else if cfg.Flags.Path != "" {
 		// We've been given a value through `--config`.
-		err = uCfg.Append(cfg.Flags.Path)
-		if err != nil {
-			return nil, NewE100("invalid --config", err)
-		}
+		sources = append(sources, cfg.Flags.Path)
 		cfg.AddConfigFile(cfg.Flags.Path)
 	} else if fromEnv, hasEnv := os.LookupEnv("VALE_CONFIG_PATH"); hasEnv {
 		// We've been given a value through `VALE_CONFIG_PATH`.
-		err = uCfg.Append(fromEnv)
-		if err != nil {
-			return nil, NewE100("invalid VALE_CONFIG_PATH", err)
-		}
+		sources = append(sources, fromEnv)
 		cfg.AddConfigFile(fromEnv)
 	} else if base != "" {
 		// We're using a config file found using a local search process.
-		err = uCfg.Append(base)
-		if err != nil {
-			return nil, NewE100(".vale.ini not found", err)
-		}
+		sources = append(sources, base)
 		cfg.AddConfigFile(base)
 	}
 
 	if StringInSlice(cfg.Flags.AlertLevel, AlertLevels) {
 		cfg.MinAlertLevel = LevelToInt[cfg.Flags.AlertLevel]
 	}
 
-	// NOTE: In v3.0, we now use the user's config directory as the default
-	// location.
-	//
-	// This is different from the other config-defining options (`--config`,
-	// `VALE_CONFIG_PATH`, etc.) in that it's loaded in addition to, rather
-	// than instead of, any other configuration sources.
-	//
-	// In other words, this config file is *always* loaded and is read after
-	// any other sources to allow for project-agnostic customization.
-	defaultCfg, _ := DefaultConfig()
-
-	if system.FileExists(defaultCfg) && !cfg.Flags.IgnoreGlobal && !dry {
-		err = uCfg.Append(defaultCfg)
-		if err != nil {
-			return nil, NewE100("default/ini", err)
-		}
-		cfg.Flags.Local = true
-		cfg.AddConfigFile(defaultCfg)
-	} else if base == "" && len(cfg.ConfigFiles) == 0 && !dry {
+	if base == "" && len(cfg.ConfigFiles) == 0 && !dry {
 		return nil, NewE100(".vale.ini not found", errors.New("no config file found"))
 	}
 
-	uCfg.BlockMode = false
+	uCfg, err = processSources(cfg, sources)
+	if err != nil {
+		return nil, NewE100("config pipeline failed", err)
+	}
 	return processConfig(uCfg, cfg, dry)
 }