Merge pull request #252 from filipw/bugfix/226

Read DefineConstants from MsBuild file
OmniSharp · Jun 30, 2015 · dc21b16 · dc21b16
2 parents 25eae94 + f0648ff
commit dc21b16
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 9 deletions.
diff --git a/src/OmniSharp/MSBuild/MSBuildProjectSystem.cs b/src/OmniSharp/MSBuild/MSBuildProjectSystem.cs
@@ -236,9 +236,15 @@ private void UpdateProject(ProjectFileInfo projectFileInfo)
                 }
             }
 
-            if (projectFileInfo.SpecifiedLanguageVersion.HasValue)
+            if (projectFileInfo.SpecifiedLanguageVersion.HasValue || projectFileInfo.DefineConstants != null)
             {
-                var parseOptions = new CSharpParseOptions(projectFileInfo.SpecifiedLanguageVersion.Value);
+                var parseOptions = projectFileInfo.SpecifiedLanguageVersion.HasValue
+                    ? new CSharpParseOptions(projectFileInfo.SpecifiedLanguageVersion.Value)
+                    : new CSharpParseOptions();
+                if (projectFileInfo.DefineConstants != null && projectFileInfo.DefineConstants.Any())
+                {
+                    parseOptions.WithPreprocessorSymbols(projectFileInfo.DefineConstants);
+                }
                 _workspace.SetParseOptions(project.Id, parseOptions);
             }
 

diff --git a/src/OmniSharp/MSBuild/ProjectFile/ProjectFileInfo.cs b/src/OmniSharp/MSBuild/ProjectFile/ProjectFileInfo.cs
@@ -31,13 +31,7 @@ public class ProjectFileInfo
 
         public LanguageVersion? SpecifiedLanguageVersion { get; private set; }
 
-        public string ProjectDirectory
-        {
-            get
-            {
-                return Path.GetDirectoryName(ProjectFilePath);
-            }
-        }
+        public string ProjectDirectory => Path.GetDirectoryName(ProjectFilePath);
 
         public string AssemblyName { get; private set; }
 
@@ -51,6 +45,8 @@ public string ProjectDirectory
 
         public IList<string> Analyzers { get; private set; }
 
+        public IList<string> DefineConstants { get; private set; }
+
         public static ProjectFileInfo Create(MSBuildOptions options, ILogger logger, string solutionDirectory, string projectFilePath, ICollection<MSBuildDiagnosticsMessage> diagnostics)
         {
             var projectFileInfo = new ProjectFileInfo();
@@ -115,6 +111,12 @@ public static ProjectFileInfo Create(MSBuildOptions options, ILogger logger, str
                     projectInstance.GetItems("Analyzer")
                                    .Select(p => p.GetMetadataValue("FullPath"))
                                    .ToList();
+
+                var defineConstants = projectInstance.GetPropertyValue("DefineConstants");
+                if (!string.IsNullOrWhiteSpace(defineConstants))
+                {
+                    projectFileInfo.DefineConstants = defineConstants.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries).Distinct().ToList();
+                }
             }
             else
             {
@@ -181,6 +183,12 @@ public static ProjectFileInfo Create(MSBuildOptions options, ILogger logger, str
                 projectFileInfo.Analyzers = itemsLookup["Analyzer"]
                     .Select(p => Path.GetFullPath(Path.Combine(projectFileInfo.ProjectDirectory, p.FinalItemSpec)))
                     .ToList();
+
+                var defineConstants = properties["DefineConstants"].FinalValue;
+                if (!string.IsNullOrWhiteSpace(defineConstants))
+                {
+                    projectFileInfo.DefineConstants = defineConstants.Split(new[] { ';' }, StringSplitOptions.RemoveEmptyEntries).Distinct().ToList();
+                }
             }
 #else
             // TODO: Shell out to msbuild/xbuild here?