Merge branch 'master' into makefile-syntax-for-justfiles

src/syntax_mapping/builtin.rs

@@ -3,7 +3,7 @@ use std::env;
 use globset::GlobMatcher;
 use once_cell::sync::Lazy;
 
-use crate::syntax_mapping::{make_glob_matcher, MappingTarget};
+use crate::syntax_mapping::{make_glob_matcher, Case, MappingTarget};
 
 // Static syntax mappings generated from /src/syntax_mapping/builtins/ by the
 // build script (/build/syntax_mapping.rs).
@@ -53,8 +53,8 @@ include!(concat!(
 /// A failure to compile is a fatal error.
 ///
 /// Used internally by `Lazy<Option<GlobMatcher>>`'s lazy evaluation closure.
-fn build_matcher_fixed(from: &str) -> GlobMatcher {
-    make_glob_matcher(from).expect("A builtin fixed glob matcher failed to compile")
+fn build_matcher_fixed(from: &str, case: Case) -> GlobMatcher {
+    make_glob_matcher(from, case).expect("A builtin fixed glob matcher failed to compile")
 }
 
 /// Join a list of matcher segments to create a glob string, replacing all
@@ -64,7 +64,7 @@ fn build_matcher_fixed(from: &str) -> GlobMatcher {
 /// to compile.
 ///
 /// Used internally by `Lazy<Option<GlobMatcher>>`'s lazy evaluation closure.
-fn build_matcher_dynamic(segs: &[MatcherSegment]) -> Option<GlobMatcher> {
+fn build_matcher_dynamic(segs: &[MatcherSegment], case: Case) -> Option<GlobMatcher> {
     // join segments
     let mut buf = String::new();
     for seg in segs {
@@ -77,7 +77,7 @@ fn build_matcher_dynamic(segs: &[MatcherSegment]) -> Option<GlobMatcher> {
         }
     }
     // compile glob matcher
-    let matcher = make_glob_matcher(&buf).ok()?;
+    let matcher = make_glob_matcher(&buf, case).ok()?;
     Some(matcher)
 }
 

src/syntax_mapping/builtins/README.md

@@ -20,12 +20,10 @@ syntax mappings defined by all TOML files, and embed them into the binary.
 
 ## File syntax
 
-Each TOML file should contain a single section named `mappings`, with each of
-its keys being a language identifier (first column of `bat -L`; also referred to
-as "target").
+Each TOML file should contain a single section named `mappings`, with each of its keys being a language
+identifier (first column of `bat -L`; also referred to as "target").
 
-The value of each key should be an array of strings, with each item being a glob
-matcher. We will call each of these items a "rule".
+The value of each key should be an array of "rules". The rules are expected to be objects with a `glob` string and a `case_sensitive` boolean. For simplification, a rule can be just a glob string, which is shorthand for the default case insensitive mode.
 
 For example, if `foo-application` uses both TOML and YAML configuration files,
 we could write something like this:
@@ -98,6 +96,15 @@ like this:
 ]
 ```
 
+### Case sensitivity
+
+By default, all glob patterns are matched case-insensitively. To match a pattern case-sensitively, use the object form of the rule with the `case_sensitive` option:
+
+```toml
+[mappings]
+"Python" = [{ glob = "BUILD", case_sensitive = true }]
+```
+
 ## Ordering
 
 At compile time, all TOML files applicable to the target are processed in

src/syntax_mapping/builtins/common/50-bazel.toml

@@ -0,0 +1,2 @@
+[mappings]
+"Python" = [{ glob = "BUILD", case_sensitive = true }]

src/syntax_mapping/builtins/common/50-dotnet-xml.toml

@@ -1,2 +1,2 @@
 [mappings]
-"XML" = ["*.csproj", "*.vbproj", "*.props", "*.targets"]
+"XML" = ["*.csproj", "*.vbproj", "*.props", "*.targets", "*.slnx"]

src/syntax_mapping/builtins/common/50-gcloud-cli-config.toml

@@ -0,0 +1,3 @@
+[mappings]
+"INI" = [".boto", "**/gcloud/configurations/config_*"]
+"Git Ignore" = [".gcloudignore"]

src/syntax_mapping/builtins/common/90-ignore-files.toml

@@ -0,0 +1,2 @@
+[mappings]
+"Git Ignore" = [".?*ignore"]