31fb708 · bat · git.iko.soy

git.iko.soy/bat

on master help sign in

Revert to previous commit

31fb708Kienyew6 years ago

src/bin/bat/main.rs−13

compare with master

unifiedsplit

@@ -86,19 +86,6 @@ pub fn list_languages(config: &Config) -> Result<()> {

86 .filter(|syntax| !syntax.hidden && !syntax.file_extensions.is_empty())

87 .cloned()

88 .collect::<Vec<_>>();

89−

90− for lang in languages.iter_mut() {

91− let lang_name = lang.name.clone();

92− lang.file_extensions.retain(|extension| {

93− let test_file = Path::new("test").with_extension(extension);

94− match config.syntax_mapping.get_syntax_for(test_file) {

95− Some(MappingTarget::MapTo(primary_lang)) => lang_name == primary_lang,

96− Some(MappingTarget::MapToUnknown) => false,

97− None => true,

98− }

99− });

100− }

101−

102 languages.sort_by_key(|lang| lang.name.to_uppercase());

89 languages.sort_by_key(|lang| lang.name.to_uppercase());

103

104 let configured_languages = get_syntax_mapping_to_paths(config.syntax_mapping.mappings());

91 let configured_languages = get_syntax_mapping_to_paths(config.syntax_mapping.mappings());

src/syntax_mapping.rs+6−14

@@ -24,12 +24,6 @@ impl<'a> SyntaxMapping<'a> {

24 let mut mapping = Self::empty();

25 mapping.insert("*.h", MappingTarget::MapTo("C++")).unwrap();

26 mapping.insert("*.fs", MappingTarget::MapTo("F#")).unwrap();

27− mapping

28− .insert("*.js", MappingTarget::MapTo("JavaScript (Babel)"))

29− .unwrap();

30− mapping

31− .insert("*.sass", MappingTarget::MapTo("Sass"))

32− .unwrap();

33 mapping

27 mapping

34 .insert("build", MappingTarget::MapToUnknown)

28 .insert("build", MappingTarget::MapToUnknown)

35 .unwrap();

29 .unwrap();

@@ -98,16 +92,14 @@ impl<'a> SyntaxMapping<'a> {

98 "*.swap",

92 "*.swap",

99 "*.target",

93 "*.target",

100 "*.timer",

94 "*.timer",

101− ]

102− .iter()

95+ ].iter() {

103− {

96+ mapping

104− mapping.insert(glob, MappingTarget::MapTo("INI")).unwrap();

97+ .insert(glob, MappingTarget::MapTo("INI"))

98+ .unwrap();

105 }

99 }

106

100

107 // pacman hooks

101 // pacman hooks

108− mapping

109− .insert("*.hook", MappingTarget::MapTo("INI"))

102+ mapping.insert("*.hook", MappingTarget::MapTo("INI")).unwrap();

110− .unwrap();

111

103

112 mapping

104 mapping

113 }

105 }

@@ -125,7 +117,7 @@ impl<'a> SyntaxMapping<'a> {

125 &self.mappings

117 &self.mappings

126 }

118 }

127

119

128− pub fn get_syntax_for(&self, path: impl AsRef<Path>) -> Option<MappingTarget<'a>> {

120+ pub(crate) fn get_syntax_for(&self, path: impl AsRef<Path>) -> Option<MappingTarget<'a>> {

129 let candidate = Candidate::new(path.as_ref());

121 let candidate = Candidate::new(path.as_ref());

130 let candidate_filename = path.as_ref().file_name().map(Candidate::new);

122 let candidate_filename = path.as_ref().file_name().map(Candidate::new);

131 for (ref glob, ref syntax) in self.mappings.iter().rev() {

123 for (ref glob, ref syntax) in self.mappings.iter().rev() {