- [Updated] Updated Resharper SDK to 2022.1.0

MrJul · Apr 20, 2022 · 23ff4ea · 23ff4ea
1 parent 22b3249
commit 23ff4ea
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 3.17.8.8
+- [Updated] Updated ReSharper SDK to 2022.1.0.
+
 ## 3.17.8-pre
 - [Added] Support for ReSharper 2022.1.0 EAP.
 

diff --git a/GammaJul.ReSharper.EnhancedTooltip.sln b/GammaJul.ReSharper.EnhancedTooltip.sln
@@ -1,12 +1,18 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.28803.202
+# Visual Studio Version 17
+VisualStudioVersion = 17.1.32319.34
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GammaJul.ReSharper.EnhancedTooltip", "source\GammaJul.ReSharper.EnhancedTooltip\GammaJul.ReSharper.EnhancedTooltip.csproj", "{503F35A4-5A44-4468-8DE2-174F0B7D3D77}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build", "build\_build.csproj", "{1C18A594-4702-4FD5-8189-5144AB6E2A59}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{D9282B81-9250-400D-8727-49870F7FE34F}"
+	ProjectSection(SolutionItems) = preProject
+		CHANGELOG.md = CHANGELOG.md
+		README.md = README.md
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU

diff --git a/README.md b/README.md
@@ -16,7 +16,7 @@ It's a plugin for [JetBrains ReSharper](http://www.jetbrains.com/resharper/) tha
 Installation
 ------------
 Visual Studio 2017, 2019 and 2022 are supported.  
-ReSharper 2021.3 must be installed.  
+ReSharper 2022.1 must be installed.  
 (Note: older versions are still available for previous ReSharper versions).
 
 Install the plugin using the built-in Extension Manager from the ReSharper menu.  

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.1.0-eap07" />
+		<PackageReference Include="JetBrains.ReSharper.SDK" Version="2022.1.0" />
 		<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/Properties/AssemblyInfo.cs b/source/GammaJul.ReSharper.EnhancedTooltip/Properties/AssemblyInfo.cs
@@ -9,4 +9,4 @@
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
-[assembly: AssemblyVersion("3.17.8.0")]
+[assembly: AssemblyVersion("3.17.8.8")]
diff --git a/source/GammaJul.ReSharper.EnhancedTooltip/VisualStudio/MainQuickInfoSource.cs b/source/GammaJul.ReSharper.EnhancedTooltip/VisualStudio/MainQuickInfoSource.cs
@@ -47,13 +47,13 @@ void GetEnhancedTooltips() {
 					IDocument document = documentMarkup.Document;
 					var presenter = new MultipleTooltipContentPresenter(tooltipFormattingProvider.GetTooltipFormatting(), document);
 					IContextBoundSettingsStore settings = document.GetSettings();
-					ISolution? solution = TryGetCurrentSolution();
+					ISolution? solution = MainQuickInfoSource.TryGetCurrentSolution();
 					bool hasIdentifierTooltipContent = false;
 
 					var resolveContext = solution is null ? UniversalModuleReferenceContext.Instance : document.GetContext(solution);
 					using (CompilationContextCookie.GetOrCreate(resolveContext)) {
 
-						if (solution is not null && GetIdentifierContentGroup(textRange.CreateDocumentRange(document), solution, settings) is { } contentGroup) {
+						if (solution is not null && MainQuickInfoSource.GetIdentifierContentGroup(textRange.CreateDocumentRange(document), solution, settings) is { } contentGroup) {
 							foreach (IdentifierTooltipContent content in contentGroup.Identifiers) {
 								presenter.AddIdentifierTooltipContent(content);
 								finalSpan = content.TrackingRange.ToSpan().Union(finalSpan);
@@ -70,7 +70,7 @@ void GetEnhancedTooltips() {
 
 						var highlighters = documentMarkup.GetHighlightersOver(textRange).ToList();
 						foreach (var highlighter in highlighters) {
-							IEnumerable<IReSharperTooltipContent> contents = GetTooltipContents(highlighter, highlighter.Range, documentMarkup, solution, hasIdentifierTooltipContent);
+							IEnumerable<IReSharperTooltipContent> contents = MainQuickInfoSource.GetTooltipContents(highlighter, highlighter.Range, documentMarkup, solution, hasIdentifierTooltipContent);
 							foreach (IReSharperTooltipContent content in contents) {
 								if (presenter.TryAddReSharperContent(content))
 									finalSpan = content.TrackingRange.ToSpan().Union(finalSpan);
@@ -157,14 +157,14 @@ private static IEnumerable<IReSharperTooltipContent> GetTooltipContents(
 				IPsiSourceFile? sourceFile = solution is null ? null : document.GetPsiSourceFile(solution);
 
 				Severity severity = HighlightingSettingsManager.Instance.GetSeverity(highlighting, highlighting.GetType(), sourceFile, settings);
-				if (TryCreateIssueContent(highlighting, range, highlighter.TryGetTooltip(HighlighterTooltipKind.TextEditor), severity, settings, solution) is { } issueContent) {
+				if (MainQuickInfoSource.TryCreateIssueContent(highlighting, range, highlighter.TryGetTooltip(HighlighterTooltipKind.TextEditor), severity, settings, solution) is { } issueContent) {
 					yield return issueContent;
 					yield break;
 				}
 
-				if (solution is not null && IsIdentifierHighlighting(highlighting)) {
+				if (solution is not null && MainQuickInfoSource.IsIdentifierHighlighting(highlighting)) {
 					if (!skipIdentifierHighlighting) {
-						var identifierContentGroup = GetIdentifierContentGroup(highlighter, solution, settings);
+						var identifierContentGroup = MainQuickInfoSource.GetIdentifierContentGroup(highlighter, solution, settings);
 						if (identifierContentGroup is not null) {
 							foreach (IdentifierTooltipContent content in identifierContentGroup.Identifiers)
 								yield return content;
@@ -176,7 +176,7 @@ private static IEnumerable<IReSharperTooltipContent> GetTooltipContents(
 				}
 			}
 
-			if (TryCreateMiscContent(highlighter.TryGetTooltip(HighlighterTooltipKind.TextEditor), range) is { } miscContent)
+			if (MainQuickInfoSource.TryCreateMiscContent(highlighter.TryGetTooltip(HighlighterTooltipKind.TextEditor), range) is { } miscContent)
 				yield return miscContent;
 		}
 
@@ -209,7 +209,7 @@ private static IEnumerable<IReSharperTooltipContent> GetTooltipContents(
 				return null;
 
 			if (settings.GetValue((IssueTooltipSettings s) => s.ColorizeElementsInErrors)) {
-				RichText? enhancedText = TryEnhanceHighlighting(highlighting, settings, solution);
+				RichText? enhancedText = MainQuickInfoSource.TryEnhanceHighlighting(highlighting, settings, solution);
 				if (!enhancedText.IsNullOrEmpty())
 					text = enhancedText!;
 			}