windows/QuickLook
1
0
Fork 0
mirror of https://github.com/QL-Win/QuickLook.git synced 2026-01-29 02:06:48 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Improve YAML highlighting and support .clang-format

Browse Source 
Added support for .clang-format files to YAML highlighting definitions. Enhanced syntax highlighting to color YAML document separators (---, ...) and their comments distinctly in both dark and light themes. Fixed a potential exception when handling lines without a colon.
This commit is contained in:
ema
2025-12-27 01:46:39 +08:00
parent 3a103e9a59
commit 3f3de0efc2
2 changed files with 94 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
QuickLook.Plugin/QuickLook.Plugin.TextViewer/Themes/HighlightingDefinitions/Dark/YAMLHighlightingDefinition.cs
View File

@@ -29,7 +29,7 @@ public class YAMLHighlightingDefinition : DarkHighlightingDefinition
{
public override string Name => "YAML";
public override string Extension => ".yaml;.yml";
public override string Extension => ".yaml;.yml;.clang-format";
public override HighlightingRuleSet MainRuleSet => new()
{
@@ -52,6 +52,11 @@ public class YAMLHighlightingDefinition : DarkHighlightingDefinition
Name = "Comment",
Foreground = new SimpleHighlightingBrush("#6A9949".ToColor()),
},
"DocumentSeparator" => new HighlightingColor
{
Name = "DocumentSeparator",
Foreground = new SimpleHighlightingBrush("#A2A2A2".ToColor()),
},
_ => null
};
}
@@ -59,6 +64,7 @@ public class YAMLHighlightingDefinition : DarkHighlightingDefinition
public override IEnumerable<HighlightingColor> NamedHighlightingColors =>
[
GetNamedColor("Comment"),
GetNamedColor("DocumentSeparator"),
];
public override DocumentColorizingTransformer[] LineTransformers { get; } = [new KeyHighlighter()];
@@ -69,6 +75,45 @@ public class YAMLHighlightingDefinition : DarkHighlightingDefinition
{
var text = CurrentContext.Document.GetText(line);
// Handle YAML document separator lines (---)
var trimmedStart = text.TrimStart();
if (trimmedStart.StartsWith("---") || trimmedStart.StartsWith("..."))
{
int idx = trimmedStart.StartsWith("---") ? text.IndexOf("---") : text.IndexOf("...");
if (idx < 0)
return;
int sepEnd = idx + 3; // end of the '---' or '...' sequence
// If there's a comment after the separator, color the separator and the comment separately
int idxSharp = text.IndexOf('#', sepEnd);
if (idxSharp >= 0)
{
// Separator
ChangeLinePart(line.Offset + idx, line.Offset + sepEnd, el =>
{
el.TextRunProperties.SetForegroundBrush("#A2A2A2".ToBrush());
});
// Comment
ChangeLinePart(line.Offset + idxSharp, line.Offset + text.Length, el =>
{
el.TextRunProperties.SetForegroundBrush("#6A9949".ToBrush());
});
}
else
{
// Only separator
ChangeLinePart(line.Offset + idx, line.Offset + sepEnd, el =>
{
el.TextRunProperties.SetForegroundBrush("#A2A2A2".ToBrush());
});
}
// Return early so other colorization rules don't override this line
return;
}
// Skip empty lines and comments
if (string.IsNullOrWhiteSpace(text) || text.TrimStart().StartsWith("#"))
return;
@@ -112,7 +157,7 @@ public class YAMLHighlightingDefinition : DarkHighlightingDefinition
else
{
int idx = text.IndexOf(':');
var val = text.Substring(idx + 1);
var val = idx >= 0 ? text.Substring(idx + 1) : string.Empty;
var valTrimmed = val.Trim();
if (idx <= 0)

49
QuickLook.Plugin/QuickLook.Plugin.TextViewer/Themes/HighlightingDefinitions/Light/YAMLHighlightingDefinition.cs
View File

@@ -29,7 +29,7 @@ public class YAMLHighlightingDefinition : LightHighlightingDefinition
{
public override string Name => "YAML";
public override string Extension => ".yaml;.yml";
public override string Extension => ".yaml;.yml;.clang-format";
public override HighlightingRuleSet MainRuleSet => new()
{
@@ -52,6 +52,11 @@ public class YAMLHighlightingDefinition : LightHighlightingDefinition
Name = "Comment",
Foreground = new SimpleHighlightingBrush("#008000".ToColor()),
},
"DocumentSeparator" => new HighlightingColor
{
Name = "DocumentSeparator",
Foreground = new SimpleHighlightingBrush("#A2A2A2".ToColor()),
},
_ => null
};
}
@@ -59,6 +64,7 @@ public class YAMLHighlightingDefinition : LightHighlightingDefinition
public override IEnumerable<HighlightingColor> NamedHighlightingColors =>
[
GetNamedColor("Comment"),
GetNamedColor("DocumentSeparator"),
];
public override DocumentColorizingTransformer[] LineTransformers { get; } = [new KeyHighlighter()];
@@ -69,6 +75,45 @@ public class YAMLHighlightingDefinition : LightHighlightingDefinition
{
var text = CurrentContext.Document.GetText(line);
// Handle YAML document separator lines (---)
var trimmedStart = text.TrimStart();
if (trimmedStart.StartsWith("---") || trimmedStart.StartsWith("..."))
{
int idx = trimmedStart.StartsWith("---") ? text.IndexOf("---") : text.IndexOf("...");
if (idx < 0)
return;
int sepEnd = idx + 3; // end of the '---' or '...' sequence
// If there's a comment after the separator, color the separator and the comment separately
int idxSharp = text.IndexOf('#', sepEnd);
if (idxSharp >= 0)
{
// Separator
ChangeLinePart(line.Offset + idx, line.Offset + sepEnd, el =>
{
el.TextRunProperties.SetForegroundBrush("#A2A2A2".ToBrush());
});
// Comment
ChangeLinePart(line.Offset + idxSharp, line.Offset + text.Length, el =>
{
el.TextRunProperties.SetForegroundBrush("#6A9949".ToBrush());
});
}
else
{
// Only separator
ChangeLinePart(line.Offset + idx, line.Offset + sepEnd, el =>
{
el.TextRunProperties.SetForegroundBrush("#A2A2A2".ToBrush());
});
}
// Return early so other colorization rules don't override this line
return;
}
// Skip empty lines and comments
if (string.IsNullOrWhiteSpace(text) || text.TrimStart().StartsWith("#"))
return;
@@ -112,7 +157,7 @@ public class YAMLHighlightingDefinition : LightHighlightingDefinition
else
{
int idx = text.IndexOf(':');
var val = text.Substring(idx + 1);
var val = idx >= 0 ? text.Substring(idx + 1) : string.Empty;
var valTrimmed = val.Trim();
if (idx <= 0)