Merge remote-tracking branch 'KL/master'

Author: VladD2

Grammars/CSharp/CSharp.Grammar/CSharp/AST/AstUtils2.n

@@ -299,7 +299,9 @@ namespace DotNet
       def double = context.GetVoidType().FullName;
       def decimal = context.GetVoidType().FullName;
 
-      match(from) {
+      match(from)
+      {
+        | x when !x.IsFullNameEvaluated => false
         | x when x.FullName == sbyte => [short, int, long, float, double, decimal].Any(s => s == to.FullName)
         | x when x.FullName == byte => [short, ushort, int, uint, long, ulong, float, double, decimal].Any(s => s == to.FullName)
         | x when x.FullName == short => [int, long, float, double, decimal].Any(s => s == to.FullName)

Nitra/Nitra.Runtime/DependentProperties/FileEvalPropertiesData.n

@@ -49,7 +49,7 @@ namespace Nitra.Declarations
     {
       when (Ast != null)
       {
-        def errorCollector = CollectSymbolErrorsVisitor(GetCompilerMessage());
+        def errorCollector = CollectSymbolErrorsVisitor(GetCompilerMessage(), Ast.Location.Source.File.UseHintMl);
         errorCollector.Visit(Ast);
       }
     }

Nitra/Nitra.Runtime/Errors/CollectSymbolErrorsVisitor.n

@@ -21,15 +21,17 @@ namespace Nitra
   public class CollectSymbolErrorsVisitor : IAstVisitor
   {
     public CompilerMessages : CompilerMessageList;
+    public UseHintMl        : bool;
 
-    public this()
+    public this(useHintMl : bool)
     {
-      this(CompilerMessageList())
+      this(CompilerMessageList(), useHintMl)
     }
 
-    public this(compilerMessages : CompilerMessageList)
+    public this(compilerMessages : CompilerMessageList, useHintMl : bool)
     {
       CompilerMessages = compilerMessages;
+      UseHintMl        = useHintMl;
     }
 
     public Visit(parseTree : IAst) : void
@@ -50,11 +52,32 @@ namespace Nitra
             CompilerMessages.Error(reference, $"Unresolved reference '$reference'");
           else when (r.IsAmbiguous && !r.IgnoreAmbiguities)
           {
-            def builder = StringBuilder(64)
-              .Append("<hint>'").HintMlEscape(reference).Append("' is an ambiguous reference between ")
-              .JoinAnd(r.Ambiguities, HintML.MakeHintMlPath(_, _, ".", true)).Append("</hint>");
+            def message =
+              if (UseHintMl)
+              {
+                StringBuilder(64).Append("<hint>'").HintMlEscape(reference).Append("' is an ambiguous reference between ")
+                  .JoinAnd(r.Ambiguities, HintML.MakeHintMlPath(_, _, ".", true)).Append("</hint>").ToString();
+              }
+              else
+              {
+                def format(symbol : DeclarationSymbol) : string
+                {
+                  if (symbol.IsFullNameEvaluated)
+                    symbol.FullName
+                  else if (symbol.IsDeclaredInOptEvaluated)
+                    match (symbol.DeclaredInOpt)
+                    {
+                      | VSome(parentSymbol) => format(parentSymbol) + "." + symbol.Name
+                      | VNone               => symbol.Name
+                    }
+                  else
+                    symbol.Name
+                }
 
-            CompilerMessages.Error(reference, builder.ToString());
+                $"'$(reference)' is an ambiguous reference between ..$(r.Ambiguities.Select(format))"
+              };
+
+            CompilerMessages.Error(reference, message);
           }
         }
 

Nitra/Nitra.Runtime/ProjectSystem/CompilerMessage.n

@@ -32,12 +32,18 @@ namespace Nitra.ProjectSystem
     }
 
     public override ToString() : string
+    {
+      ToString(false)
+    }
+
+    public ToString(warningsAsErrors : bool) : string
     {
       def type =
         match (Type)
         {
           | FatalError
-          | Error      => "error: "
+          | Error
+          | Warning when warningsAsErrors => "error: "
           | Warning    => "warning: "
           | Hint       => "hint: "
         }

Nitra/Nitra.Runtime/ProjectSystem/File.n

@@ -38,6 +38,7 @@ namespace Nitra.ProjectSystem
     public event    Redraw      : Action;
     public virtual  IsFake      : bool           { get { false } }
     public          IsActive    : bool           { get; protected set; }
+    public          UseHintMl   : bool           { get { Project != null && Project.UseHintMl } }
 
     [RecordIgnore] protected mutable _parseMessages : CompilerMessageList = CompilerMessageList();
     public ParseMessages        : Seq[CompilerMessage] { get { _parseMessages } }
@@ -71,7 +72,7 @@ namespace Nitra.ProjectSystem
       def symbolErrors =
         if (HasAst)
         {
-          def errorCollector = CollectSymbolErrorsVisitor();
+          def errorCollector = CollectSymbolErrorsVisitor(UseHintMl);
           errorCollector.Visit(Ast);
           errorCollector.CompilerMessages
         }

Nitra/Nitra.Runtime/ProjectSystem/FileBased/FsProject.n

@@ -20,6 +20,7 @@ namespace Nitra.ProjectSystem
   {
     public FsSolution : FsSolution[TAst]                   { get; internal set; }
     public FsFiles    : ObservableCollection[FsFile[TAst]] { get; private set; }
+    public override UseHintMl : bool { get { false } }
 
     public this([NotNull] solution : FsSolution[TAst], projectDir : string, libs : Seq[LibReference])
     {

Nitra/Nitra.Runtime/ProjectSystem/Project.n

@@ -32,6 +32,7 @@ namespace Nitra.ProjectSystem
     public virtual Libs : Seq[LibReference] { get; protected set; }
     public ProjectDir : string { get; protected set; }
     public event OnSymbolAssemblyResolve : Func[Project, AssemblyName, Assembly];
+    public virtual UseHintMl : bool { get { true } }
 
     protected this()
     {