- [Updated] Updated ReSharper SDK to 2023.1.0-eap09

MrJul · Mar 29, 2023 · 962a5d1 · 962a5d1
1 parent 13ccc1d
commit 962a5d1
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 3.20.0.2-pre
+- [Updated] Updated ReSharper SDK to 2023.1.0-eap09.
+
 ## 3.19.0.4
 - [Fixed] Fixed tooltip doesnt open for "base" keyword.
 - [Updated] Updated ReSharper SDK to 2022.3.0.

diff --git a/source/GammaJul.ReSharper.EnhancedTooltip/GammaJul.ReSharper.EnhancedTooltip.csproj b/source/GammaJul.ReSharper.EnhancedTooltip/GammaJul.ReSharper.EnhancedTooltip.csproj
@@ -20,7 +20,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="JetBrains.ReSharper.SDK" Version="2022.3.0" />
+		<PackageReference Include="JetBrains.ReSharper.SDK" Version="2023.1.0-eap09" />
 		<PackageReference Include="EnvDTE" Version="8.0.0" />
 		<PackageReference Include="VSSDK.Editor" Version="11.0.*" />
 		<PackageReference Include="VSSDK.Language" Version="11.0.*" />

diff --git a/source/GammaJul.ReSharper.EnhancedTooltip/Presentation/CSharpColorizer.cs b/source/GammaJul.ReSharper.EnhancedTooltip/Presentation/CSharpColorizer.cs
@@ -2,6 +2,7 @@
 using System.Linq;
 using System.Collections.Generic;
 using System.Drawing;
+using System.Runtime.CompilerServices;
 using System.Text;
 using GammaJul.ReSharper.EnhancedTooltip.DocumentMarkup;
 using GammaJul.ReSharper.EnhancedTooltip.Psi;
@@ -13,6 +14,7 @@
 using JetBrains.ReSharper.Psi.CSharp;
 using JetBrains.ReSharper.Psi.CSharp.DeclaredElements;
 using JetBrains.ReSharper.Psi.CSharp.Impl;
+using JetBrains.ReSharper.Psi.CSharp.Impl.Resolve;
 using JetBrains.ReSharper.Psi.CSharp.Parsing;
 using JetBrains.ReSharper.Psi.CSharp.Tree;
 using JetBrains.ReSharper.Psi.CSharp.Util;
@@ -311,14 +313,18 @@ private void AppendDeclaredType(
 			bool displayUnknownTypeParameters,
 			Context context) {
 
-			if (declaredType is IDynamicType) {
+      if (declaredType.IsDynamicType()) {
 				AppendText("dynamic", _highlighterIdProvider.Keyword);
 				return;
 			}
 
-			if (declaredType is ITupleType tupleType) {
-				AppendTupleType(tupleType, expectedQualifierDisplay, displayUnknownTypeParameters, context);
-				return;
+			if (declaredType.IsTupleType()) {
+        var tupleType = declaredType.AsTupleType();
+        if (tupleType != null) {
+          AppendTupleType(tupleType.Value, expectedQualifierDisplay, displayUnknownTypeParameters, context);
+        }
+
+        return;
 			}
 
 			if (context.Options.UseTypeKeywords) {
@@ -345,14 +351,14 @@ private void AppendDeclaredType(
 		}
 
 		private void AppendTupleType(
-			ITupleType tupleType,
+			DecoratedType<TupleTypeDecoration> tupleType,
 			QualifierDisplays expectedQualifierDisplay,
 			bool displayUnknownTypeParameters,
 			Context context) {
 
 			AppendText("(", null);
 
-			IReadOnlyList<TupleTypeComponent> components = tupleType.Components;
+			IReadOnlyList<TupleTypeComponent> components = tupleType.GetComponents();
 			int componentCount = components.Count;
 			for (int i = 0; i < componentCount; ++i) {
 				if (i > 0)

diff --git a/source/GammaJul.ReSharper.EnhancedTooltip/Properties/AssemblyInfo.cs b/source/GammaJul.ReSharper.EnhancedTooltip/Properties/AssemblyInfo.cs
@@ -9,4 +9,4 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("3.19.0.4")]
+[assembly: AssemblyVersion("3.20.0.2")]