Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/Directory.props
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
<PackOnBuild>true</PackOnBuild>
<PackFolder>analyzers/dotnet/cs</PackFolder>
<GenerateDocumentationFile>false</GenerateDocumentationFile>
<RestoreSources>https://api.nuget.org/v3/index.json</RestoreSources>
<RestoreSources Condition="Exists('$(MSBuildThisFileDirectory)..\..\nugetizer\bin\')">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\nugetizer\bin'));$(RestoreSources)</RestoreSources>

<PackageProjectUrl>https://clarius.org/ThisAssembly</PackageProjectUrl>
Expand Down
15 changes: 9 additions & 6 deletions src/ThisAssembly.Resources/ResourcesGenerator.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
using System;
using System.Collections.Immutable;
using System.Collections.Generic;
using System.IO;
using System.Linq;
using System.Text;
Expand Down Expand Up @@ -35,24 +35,27 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
.Combine(context.AnalyzerConfigOptionsProvider
.Select((p, _) =>
{
p.GlobalOptions.TryGetValue("build_property.EmbeddedResourceStringExtensions", out var extensions);
return extensions!;
if (!p.GlobalOptions.TryGetValue("build_property.EmbeddedResourceStringExtensions", out var extensions) ||
extensions == null)
return new HashSet<string>();

return new HashSet<string>(extensions.Split('|'), StringComparer.OrdinalIgnoreCase);
}));

context.RegisterSourceOutput(
files,
GenerateSource);
}

static void GenerateSource(SourceProductionContext spc, ((string resourceName, string? kind, string? comment), string extensions) arg2)
static void GenerateSource(SourceProductionContext spc, ((string resourceName, string? kind, string? comment), HashSet<string> extensions) arg2)
{
var ((resourceName, kind, comment), extensions) = arg2;

var file = "CSharp.sbntxt";
var template = Template.Parse(EmbeddedResource.GetContent(file), file);

var isText = kind != null && kind.Equals("text", StringComparison.OrdinalIgnoreCase)
|| extensions.Split(';').Contains(Path.GetFileName(resourceName));
var isText = kind?.Equals("text", StringComparison.OrdinalIgnoreCase) == true ||
extensions.Contains(Path.GetExtension(resourceName));
var root = Area.Load(new Resource(resourceName, comment, isText));
var model = new Model(root);

Expand Down
2 changes: 1 addition & 1 deletion src/ThisAssembly.Resources/ThisAssembly.Resources.props
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>

<PropertyGroup>
<EmbeddedResourceStringExtensions>.txt;.cs;.sql;.json;.md;</EmbeddedResourceStringExtensions>
<EmbeddedResourceStringExtensions>.txt|.cs|.sql|.json|.md;</EmbeddedResourceStringExtensions>
</PropertyGroup>

</Project>