Merge pull request #1003 from JetBrains/bug/RIDER-23429

Downgrade unresolved symbol error to warning

Author: citizenmatt

CHANGELOG.md

@@ -17,6 +17,8 @@ This plugin has functionality that is common to both ReSharper and Rider. It als
 - Mark more methods as expensive inside a performance critical context (#1000)
 - Improve performance of rename and find usages with YAML files (#983)
 - Improve performance of typing in YAML files, by incrementally re-parsing only the YAML document that contains the change (#993)
+- Remove repeated use of project name from Unity Explorer when under assembly definition (#982, #989)
+- Changed unresolved symbol error in `GetComponent`, `AddComponent` and `ScriptableObject.CreateInstance` to a configurable warning ([RIDER-23429](https://youtrack.jetbrains.com/issue/RIDER-23429), #1003)
 
 ### Fixed
 - Fix processing hierarchy for YAML scene files (#985)
@@ -84,7 +86,7 @@ This plugin has functionality that is common to both ReSharper and Rider. It als
 * For Rider 2018.3.1. Not released for ReSharper
 * [Commits](https://github.com/JetBrains/resharper-unity/compare/183-eap10-rtm...183-eap11-rtm)
 * [Milestone](https://github.com/JetBrains/resharper-unity/milestone/23?closed=1)
-* [Tag](https://github.com/JetBrains/resharper-unity/releases/tag/183-eap11-rtm)
+* [GitHub release](https://github.com/JetBrains/resharper-unity/releases/tag/183-eap11-rtm)
 
 ### Added
 - Automatically disable YAML parsing if the project is too large (#973)
@@ -100,7 +102,7 @@ This plugin has functionality that is common to both ReSharper and Rider. It als
 * For Rider 2018.3. Not released for ReSharper
 * [Commits](https://github.com/JetBrains/resharper-unity/compare/182-eap12-2018.2.3...183-eap10-rtm)
 * [Milestone](https://github.com/JetBrains/resharper-unity/milestone/19?closed=1)
-* [Tag](https://github.com/JetBrains/resharper-unity/releases/tag/183-eap11-rtm)
+* [GitHub release](https://github.com/JetBrains/resharper-unity/releases/tag/183-eap10-rtm)
 
 ### Added
 - Add parsing of method and class usage from scene, prefab and asset files (#263, [RIDER-7460](https://youtrack.jetbrains.com/issue/RIDER-7460), #870, #873, #903, #921, [RIDER-21907](https://youtrack.jetbrains.com/issue/RIDER-21907), [RIDER-21897](https://youtrack.jetbrains.com/issue/RIDER-21897), #943, #949)

resharper/resharper-unity/src/CSharp/Daemon/Errors/CSharpErrors.xml

@@ -194,6 +194,14 @@
         </Description>
         <CompoundItemName>Possible unintended bypass of lifetime check of underlying Unity engine object</CompoundItemName>
       </Tag>
+
+      <Tag externalName="UnresolvedComponentOrScriptableObjectWarning.HIGHLIGHTING_ID" default="WARNING">
+        <Title>Cannot resolve component or scriptable object</Title>
+        <Description>
+          The class referred to in the call to 'GetComponent', 'AddComponent' or 'ScriptableObject.CreateInstance' cannot
+          be found in the current project or referenced assemblies. The call is likely to fail at runtime and return null.
+        </Description>
+      </Tag>
     </Group>
   </SeverityConfiguration>
 
@@ -486,4 +494,12 @@
     <Range>Expression.GetHighlightingRange()</Range>
     <Behavour overlapResolvePolicy="WARNING" />
   </Warning>
+
+  <Warning name="UnresolvedComponentOrScriptableObject" configurableSeverity="Unity.UnresolvedComponentOrScriptableObject">
+    <Parameter type="IReference" name="reference" />
+    <Message value="Cannot resolve symbol '{0}'">
+      <Argument>Reference.GetName()</Argument>
+    </Message>
+    <Range>Reference.GetDocumentRange()</Range>
+  </Warning>
 </Errors>

resharper/resharper-unity/src/CSharp/Feature/Services/Daemon/UnityObjectIncorrectBaseTypeErrorHandler.cs renamed to resharper/resharper-unity/src/CSharp/Feature/Services/Daemon/UnityObjectReferenceErrorHandler.cs

@@ -9,12 +9,14 @@
 namespace JetBrains.ReSharper.Plugins.Unity.CSharp.Feature.Services.Daemon
 {
     [Language(typeof(CSharpLanguage))]
-    public class UnityObjectIncorrectBaseTypeErrorHandler : IResolveProblemHighlighter
+    public class UnityObjectReferenceErrorHandler : IResolveProblemHighlighter
     {
         // We only get called for our known resolve errors
         public IHighlighting Run(IReference reference)
         {
             var errorType = reference.CheckResolveResult();
+            if (errorType == UnityResolveErrorType.UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT)
+                return new UnresolvedComponentOrScriptableObjectWarning(reference);
             if (errorType == UnityResolveErrorType.EXPECTED_COMPONENT)
                 return new ExpectedComponentWarning(reference, KnownTypes.Component.FullName);
             if (errorType == UnityResolveErrorType.EXPECTED_MONO_BEHAVIOUR)
@@ -27,6 +29,7 @@ public IHighlighting Run(IReference reference)
 
         public IEnumerable<ResolveErrorType> ErrorTypes => new[]
         {
+            UnityResolveErrorType.UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT,
             UnityResolveErrorType.EXPECTED_COMPONENT,
             UnityResolveErrorType.EXPECTED_MONO_BEHAVIOUR,
             UnityResolveErrorType.EXPECTED_SCRIPTABLE_OBJECT

resharper/resharper-unity/src/CSharp/Psi/Resolve/UnityObjectTypeOrNamespaceReference.cs

@@ -80,6 +80,19 @@ protected override IReference BindToInternal(IDeclaredElement declaredElement, I
             return this;
         }
 
+        public override ResolveResultWithInfo GetResolveResult(ISymbolTable symbolTable, string referenceName)
+        {
+            var result = base.GetResolveResult(symbolTable, referenceName);
+            if (result.ResolveErrorType == ResolveErrorType.NOT_RESOLVED)
+            {
+                // It's not necessarily an error that we can't resolve. It might be that GetComponent (or whatever) is
+                // being used as part of a modular architecture
+                return new ResolveResultWithInfo(result.Result, UnityResolveErrorType.UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT);
+            }
+
+            return result;
+        }
+
         public override ISymbolTable GetReferenceSymbolTable(bool useReferenceName)
         {
             if (myQualifier == null && myIsFinalPart)

resharper/resharper-unity/src/CSharp/Psi/Resolve/UnityResolveErrorType.cs

@@ -24,5 +24,8 @@ private UnityResolveErrorType([NotNull] string name)
 
         [NotNull] public static readonly ResolveErrorType EXPECTED_SCRIPTABLE_OBJECT =
             new UnityResolveErrorType("EXPECTED_SCRIPTABLE_OBJECT");
+
+        [NotNull] public static readonly ResolveErrorType UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT =
+            new UnityResolveErrorType("UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT");
     }
 }

resharper/resharper-unity/src/resharper-unity.resharper.nuspec

@@ -66,6 +66,7 @@
 - Improve redundant event function warnings
 - Stop Generate Code dialog selecting all event functions by default when called from the gutter icon or Code Vision marker
 - Prevent Respeller running on .asmdef files
+- Changed unresolved symbol error in `GetComponent`, `AddComponent` and `ScriptableObject.CreateInstance` to a configurable warning (RIDER-23429, #1003)
 - Fix C# language level override incorrectly handling latest
 - Fix to stop generating readonly modifier when converting auto property to property with serialised backing field
 - Fix bug in ShaderLab parsing Blend operations

resharper/resharper-unity/test/data/CSharp/Resolve/UnityObjectTypeInStringLiteral/AddComponent01.cs.gold

@@ -92,16 +92,16 @@ namespace Other
 }
 
 ------------------------------------------------
-0: result=NOT_RESOLVED declaredElem=null
-1: result=NOT_RESOLVED declaredElem=null
+0: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+1: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 2: result=TYPE_EXPECTED declaredElem=INotAClass
-3: result=NOT_RESOLVED declaredElem=null
-4: result=NOT_RESOLVED declaredElem=null
-5: result=NOT_RESOLVED declaredElem=null
-6: result=NOT_RESOLVED declaredElem=null
+3: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+4: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+5: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+6: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 7: result=OK declaredElem=Other
-8: result=NOT_RESOLVED declaredElem=null
-9: result=NOT_RESOLVED declaredElem=null
+8: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+9: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 10: result=EXPECTED_MONO_BEHAVIOUR declaredElem=WrongBaseType
 11: result=EXPECTED_MONO_BEHAVIOUR declaredElem=WrongComponentBaseType
 12: result=INCORRECT_TYPE_PARAMETER_NUMBER declaredElem=MonoBehaviourWithTypeParameter<T>
@@ -117,7 +117,7 @@ namespace Other
 22: result=OK declaredElem=Nested1.Nested2.Nested3.Nested4.MonoBehaviourInNestedNamespace
 23: result=OK declaredElem=Other
 24: result=OK declaredElem=Other.MonoBehaviourInOtherNamespace
-25: result=NOT_RESOLVED declaredElem=null
+25: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 26: result=EXPECTED_COMPONENT declaredElem=null
 Candidates:
   UnityEditor.CrashReporting
@@ -134,7 +134,7 @@ Candidates:
 31: result=OK declaredElem=UnityEngine.HingeJoint
 32: result=OK declaredElem=Other
 33: result=OK declaredElem=Other.MonoBehaviourInOtherNamespace
-34: result=NOT_RESOLVED declaredElem=null
+34: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 35: result=MULTIPLE_CANDIDATES declaredElem=null
 Candidates:
   Grid

resharper/resharper-unity/test/data/CSharp/Resolve/UnityObjectTypeInStringLiteral/GetComponent01.cs.gold

@@ -90,16 +90,16 @@ namespace Other
 }
 
 ------------------------------------------------
-0: result=NOT_RESOLVED declaredElem=null
-1: result=NOT_RESOLVED declaredElem=null
+0: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+1: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 2: result=TYPE_EXPECTED declaredElem=INotAClass
-3: result=NOT_RESOLVED declaredElem=null
-4: result=NOT_RESOLVED declaredElem=null
-5: result=NOT_RESOLVED declaredElem=null
-6: result=NOT_RESOLVED declaredElem=null
+3: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+4: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+5: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+6: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 7: result=OK declaredElem=Other
-8: result=NOT_RESOLVED declaredElem=null
-9: result=NOT_RESOLVED declaredElem=null
+8: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+9: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 10: result=EXPECTED_MONO_BEHAVIOUR declaredElem=WrongBaseType
 11: result=EXPECTED_MONO_BEHAVIOUR declaredElem=WrongComponentBaseType
 12: result=INCORRECT_TYPE_PARAMETER_NUMBER declaredElem=MonoBehaviourWithTypeParameter<T>
@@ -115,7 +115,7 @@ namespace Other
 22: result=OK declaredElem=Nested1.Nested2.Nested3.Nested4.MonoBehaviourInNestedNamespace
 23: result=OK declaredElem=Other
 24: result=OK declaredElem=Other.MonoBehaviourInOtherNamespace
-25: result=NOT_RESOLVED declaredElem=null
+25: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 26: result=EXPECTED_COMPONENT declaredElem=null
 Candidates:
   UnityEditor.CrashReporting
@@ -132,7 +132,7 @@ Candidates:
 31: result=OK declaredElem=UnityEngine.HingeJoint
 32: result=OK declaredElem=Other
 33: result=OK declaredElem=Other.MonoBehaviourInOtherNamespace
-34: result=NOT_RESOLVED declaredElem=null
+34: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 35: result=MULTIPLE_CANDIDATES declaredElem=null
 Candidates:
   Grid

resharper/resharper-unity/test/data/CSharp/Resolve/UnityObjectTypeInStringLiteral/ScriptableObjectCreateInstance01.cs.gold

@@ -76,16 +76,16 @@ namespace Nested1
 }
 
 ------------------------------------------------
-0: result=NOT_RESOLVED declaredElem=null
-1: result=NOT_RESOLVED declaredElem=null
+0: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+1: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 2: result=TYPE_EXPECTED declaredElem=INotAClass
-3: result=NOT_RESOLVED declaredElem=null
-4: result=NOT_RESOLVED declaredElem=null
-5: result=NOT_RESOLVED declaredElem=null
-6: result=NOT_RESOLVED declaredElem=null
+3: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+4: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+5: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+6: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 7: result=OK declaredElem=Other
-8: result=NOT_RESOLVED declaredElem=null
-9: result=NOT_RESOLVED declaredElem=null
+8: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
+9: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 10: result=EXPECTED_SCRIPTABLE_OBJECT declaredElem=WrongBaseType
 11: result=INCORRECT_TYPE_PARAMETER_NUMBER declaredElem=ScriptableObjectWithTypeParameter<T>
 12: result=OK declaredElem=ScriptableObjectInGlobalNamespace
@@ -100,11 +100,11 @@ namespace Nested1
 21: result=OK declaredElem=Nested1.Nested2.Nested3.Nested4.ScriptableObjectInNestedNamespace
 22: result=OK declaredElem=Other
 23: result=OK declaredElem=Other.ScriptableObjectInOtherNamespace
-24: result=NOT_RESOLVED declaredElem=null
+24: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null
 25: result=MULTIPLE_CANDIDATES declaredElem=null
 Candidates:
   MultipleCandidates
   Other.MultipleCandidates
 26: result=OK declaredElem=Other
 27: result=OK declaredElem=Other.ScriptableObjectInOtherNamespace
-28: result=NOT_RESOLVED declaredElem=null
+28: result=UNRESOLVED_COMPONENT_OR_SCRIPTABLE_OBJECT declaredElem=null

rider/src/main/resources/META-INF/plugin.xml

@@ -192,6 +192,8 @@
   <li>Mark more methods as expensive inside a performance critical context (<a href="https://github.com/JetBrains/resharper-unity/issues/1000">#1000</a>)</li>
   <li>Improve performance of rename and find usages with YAML files (<a href="https://github.com/JetBrains/resharper-unity/issues/983">#983</a>)</li>
   <li>Improve performance of typing in YAML files, by incrementally re-parsing only the YAML document that contains the change (<a href="https://github.com/JetBrains/resharper-unity/issues/993">#993</a>)</li>
+  <li>Remove repeated use of project name from Unity Explorer when under assembly definition (<a href="https://github.com/JetBrains/resharper-unity/issues/982">#982</a>, <a href="https://github.com/JetBrains/resharper-unity/pull/989">#989</a>)</li>
+  <li>Changed unresolved symbol error in `GetComponent`, `AddComponent` and `ScriptableObject.CreateInstance` to a configurable warning (<a href="https://youtrack.jetbrains.com/issue/RIDER-23429">RIDER-23429</a>, <a href="https://github.com/JetBrains/resharper-unity/issues/1003">#1003</a>)</li>
 </ul>
 <em>Fixed:</em>
 <ul>