Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix design-time build for Antlr-generated files #1002

Merged
merged 3 commits into from
Oct 31, 2017
Merged
Changes from 1 commit
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
16 changes: 10 additions & 6 deletions src/OmniSharp.MSBuild/ProjectFile/ProjectFileInfo.cs
Original file line number Diff line number Diff line change
@@ -203,7 +203,8 @@ private static ProjectData CreateProjectData(ProjectInstance projectInstance, Im
var signAssembly = PropertyConverter.ToBoolean(projectInstance.GetPropertyValue(PropertyNames.SignAssembly), defaultValue: false);
var assemblyOriginatorKeyFile = projectInstance.GetPropertyValue(PropertyNames.AssemblyOriginatorKeyFile);

var sourceFiles = GetFullPaths(projectInstance.GetItems(ItemNames.Compile));
var sourceFiles = GetFullPaths(
projectInstance.GetItems(ItemNames.Compile), filter: FileNameIsNotGenerated);
var projectReferences = GetFullPaths(projectInstance.GetItems(ItemNames.ProjectReference));
var references = GetFullPaths(
projectInstance.GetItems(ItemNames.ReferencePath).Where(ReferenceSourceTargetIsNotProjectReference));
@@ -273,20 +274,23 @@ private static Dictionary<string, string> GetGlobalProperties(MSBuildInstance ms
}

private static bool ReferenceSourceTargetIsNotProjectReference(ProjectItemInstance item)
{
return item.GetMetadataValue(MetadataNames.ReferenceSourceTarget) != ItemNames.ProjectReference;
}
=> item.GetMetadataValue(MetadataNames.ReferenceSourceTarget) != ItemNames.ProjectReference;

private static ImmutableArray<string> GetFullPaths(IEnumerable<ProjectItemInstance> items)
private static bool FileNameIsNotGenerated(string filePath)
=> !Path.GetFileName(filePath).StartsWith("TemporaryGeneratedFile_");

private static ImmutableArray<string> GetFullPaths(IEnumerable<ProjectItemInstance> items, Func<string, bool> filter = null)
{
var builder = ImmutableArray.CreateBuilder<string>();
var addedSet = new HashSet<string>();

filter = filter ?? (_ => true);

foreach (var item in items)
{
var fullPath = item.GetMetadataValue(MetadataNames.FullPath);

if (addedSet.Add(fullPath))
if (filter(fullPath) && addedSet.Add(fullPath))
{
builder.Add(fullPath);
}