Update Roslyn to 4.12

dnSpyEx · Dec 5, 2024 · e62233e · e62233e
1 parent 2350e2c
commit e62233e
Show file tree

Hide file tree

Showing 9 changed files with 22 additions and 24 deletions.
diff --git a/DnSpyCommon.props b/DnSpyCommon.props
@@ -55,7 +55,7 @@
     <MSVSTextVersion>15.5.27130</MSVSTextVersion>
     <NewtonsoftJsonVersion>13.0.3</NewtonsoftJsonVersion>
     <OokiiDialogsWpfVersion>5.0.1</OokiiDialogsWpfVersion>
-    <RoslynVersion>4.11.0</RoslynVersion>
+    <RoslynVersion>4.12.0</RoslynVersion>
     <SCCompositionVersion>9.0.0</SCCompositionVersion>
     <NuGetVersion>6.12.1</NuGetVersion>
     <DbgShimVersion>9.0.553101</DbgShimVersion>

diff --git a/dnSpy/Roslyn/Roslyn.ExpressionCompiler b/dnSpy/Roslyn/Roslyn.ExpressionCompiler
diff --git a/dnSpy/Roslyn/dnSpy.Roslyn.EditorFeatures/SmartIndent/SmartIndent.cs b/dnSpy/Roslyn/dnSpy.Roslyn.EditorFeatures/SmartIndent/SmartIndent.cs
@@ -50,7 +50,7 @@ public void Dispose() { }
 					NewLine = _textView.Options.GetNewLineCharacter()
 				};
 
-				var indentationOptions = new IndentationOptions(SyntaxFormattingOptions.GetDefault(document.Project.Services) with { LineFormatting = lineFormattingOptions });
+				var indentationOptions = new IndentationOptions(SyntaxFormattingOptions.CommonDefaults with { LineFormatting = lineFormattingOptions });
 				var parsedDocument = ParsedDocument.CreateSynchronously(document, cancellationToken);
 				var result = newService.GetIndentation(parsedDocument, line.LineNumber, indentationOptions, cancellationToken);
 				return result.GetIndentation(_textView, line);

diff --git a/dnSpy/Roslyn/dnSpy.Roslyn.Internal/QuickInfo/Providers/AbstractSemanticQuickInfoProvider.cs b/dnSpy/Roslyn/dnSpy.Roslyn.Internal/QuickInfo/Providers/AbstractSemanticQuickInfoProvider.cs
@@ -148,7 +148,7 @@ protected async Task<QuickInfoContent> CreateContentAsync(HostWorkspaceServices
 			var symbols = tokenInformation.Symbols;
 
 			// if generating quick info for an attribute, prefer bind to the class instead of the constructor
-			if (syntaxFactsService.IsAttributeName(token.Parent!)) {
+			if (syntaxFactsService.IsNameOfAttribute(token.Parent!)) {
 				symbols = symbols.OrderBy((s1, s2) =>
 					s1.Kind == s2.Kind ? 0 :
 					s1.Kind == SymbolKind.NamedType ? -1 :
@@ -346,7 +346,7 @@ private ImmutableArray<TaggedText> GetDocumentationContent(IEnumerable<ISymbol>
 				var symbol = symbols.First().OriginalDefinition;
 
 				// if generating quick info for an attribute, bind to the class instead of the constructor
-				if (syntaxFactsService.IsAttributeName(token.Parent) &&
+				if (syntaxFactsService.IsNameOfAttribute(token.Parent) &&
 					symbol.ContainingType?.IsAttribute() == true) {
 					symbol = symbol.ContainingType;
 				}

diff --git a/dnSpy/Roslyn/dnSpy.Roslyn.Internal/SignatureHelp/SignatureHelpItems.cs b/dnSpy/Roslyn/dnSpy.Roslyn.Internal/SignatureHelp/SignatureHelpItems.cs
@@ -35,8 +35,8 @@ public SignatureHelpItems(SIGHLP.SignatureHelpItems signatureHelpItems) {
 			if (signatureHelpItems == null)
 				throw new ArgumentNullException(nameof(signatureHelpItems));
 			ApplicableSpan = signatureHelpItems.ApplicableSpan;
-			ArgumentCount = signatureHelpItems.ArgumentCount;
-			ArgumentIndex = signatureHelpItems.ArgumentIndex;
+			ArgumentCount = signatureHelpItems.SyntacticArgumentCount;
+			ArgumentIndex = signatureHelpItems.SemanticParameterIndex;
 			ArgumentName = signatureHelpItems.ArgumentName;
 			SelectedItemIndex = signatureHelpItems.SelectedItemIndex;
 			Items = ToSignatureHelpItem(signatureHelpItems.Items);

diff --git a/dnSpy/Roslyn/dnSpy.Roslyn.Internal/SignatureHelp/SignatureHelpService.Roslyn.cs b/dnSpy/Roslyn/dnSpy.Roslyn.Internal/SignatureHelp/SignatureHelpService.Roslyn.cs
@@ -29,7 +29,7 @@ partial class SignatureHelpService {
 			ISignatureHelpProvider[] providers,
 			int caretPosition,
 			SIGHLP.SignatureHelpTriggerInfo triggerInfo,
-			SignatureHelpOptions options,
+			MemberDisplayOptions options,
 			Document document,
 			CancellationToken cancellationToken) {
 			ISignatureHelpProvider bestProvider = null;

diff --git a/dnSpy/Roslyn/dnSpy.Roslyn.Internal/SignatureHelp/SignatureHelpService.cs b/dnSpy/Roslyn/dnSpy.Roslyn.Internal/SignatureHelp/SignatureHelpService.cs
@@ -99,7 +99,7 @@ public static SignatureHelpService GetService(Document document) {
 		}
 
 		public async Task<SignatureHelpResult> GetItemsAsync(Document document, int position, SignatureHelpTriggerInfo triggerInfo, CancellationToken cancellationToken = default(CancellationToken)) {
-			var res = await ComputeItemsAsync(signatureHelpProviders, position, triggerInfo.ToSignatureHelpTriggerInfo(), SignatureHelpOptions.Default, document, cancellationToken).ConfigureAwait(false);
+			var res = await ComputeItemsAsync(signatureHelpProviders, position, triggerInfo.ToSignatureHelpTriggerInfo(), MemberDisplayOptions.Default, document, cancellationToken).ConfigureAwait(false);
 			return GetSignatureHelpResult(res, document);
 		}
 

diff --git a/dnSpy/Roslyn/dnSpy.Roslyn.Internal/SmartIndent/IndentationOptions.cs b/dnSpy/Roslyn/dnSpy.Roslyn.Internal/SmartIndent/IndentationOptions.cs
@@ -14,7 +14,5 @@ readonly record struct IndentationOptions([property: DataMember(Order = 0)] Synt
 
 		public const FormattingOptions2.IndentStyle DefaultIndentStyle = FormattingOptions2.IndentStyle.Smart;
 
-		public static IndentationOptions GetDefault(LanguageServices languageServices) =>
-			new IndentationOptions(SyntaxFormattingOptions.GetDefault(languageServices));
 	}
 }
diff --git a/dnSpy/dnSpy/app.config b/dnSpy/dnSpy/app.config
@@ -58,55 +58,55 @@
 
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CodeAnalysis" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-				<bindingRedirect oldVersion="1.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
+				<bindingRedirect oldVersion="1.0.0.0-4.12.0.0" newVersion="4.12.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-				<bindingRedirect oldVersion="1.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
+				<bindingRedirect oldVersion="1.0.0.0-4.12.0.0" newVersion="4.12.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Features" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-				<bindingRedirect oldVersion="1.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
+				<bindingRedirect oldVersion="1.0.0.0-4.12.0.0" newVersion="4.12.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-				<bindingRedirect oldVersion="1.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
+				<bindingRedirect oldVersion="1.0.0.0-4.12.0.0" newVersion="4.12.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CodeAnalysis.CSharp.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-				<bindingRedirect oldVersion="1.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
+				<bindingRedirect oldVersion="1.0.0.0-4.12.0.0" newVersion="4.12.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CodeAnalysis.Features" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-				<bindingRedirect oldVersion="1.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
+				<bindingRedirect oldVersion="1.0.0.0-4.12.0.0" newVersion="4.12.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CodeAnalysis.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-				<bindingRedirect oldVersion="1.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
+				<bindingRedirect oldVersion="1.0.0.0-4.12.0.0" newVersion="4.12.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-				<bindingRedirect oldVersion="1.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
+				<bindingRedirect oldVersion="1.0.0.0-4.12.0.0" newVersion="4.12.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic.Scripting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-				<bindingRedirect oldVersion="1.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
+				<bindingRedirect oldVersion="1.0.0.0-4.12.0.0" newVersion="4.12.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic.Features" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-				<bindingRedirect oldVersion="1.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
+				<bindingRedirect oldVersion="1.0.0.0-4.12.0.0" newVersion="4.12.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CodeAnalysis.VisualBasic.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-				<bindingRedirect oldVersion="1.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
+				<bindingRedirect oldVersion="1.0.0.0-4.12.0.0" newVersion="4.12.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-				<bindingRedirect oldVersion="1.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
+				<bindingRedirect oldVersion="1.0.0.0-4.12.0.0" newVersion="4.12.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Microsoft.CodeAnalysis.Workspaces.Desktop" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-				<bindingRedirect oldVersion="1.0.0.0-4.11.0.0" newVersion="4.11.0.0" />
+				<bindingRedirect oldVersion="1.0.0.0-4.12.0.0" newVersion="4.12.0.0" />
 			</dependentAssembly>
 
 			<dependentAssembly>
+1 −0		CSharp/CSharpExpressionCompiler/CSharpExpressionCompiler.vsdconfigxml
+4 −8		CSharp/CSharpExpressionCompiler/Symbols/EELocalSymbol.cs
+3 −1		CSharp/CSharpExpressionCompiler/Symbols/EEMethodSymbol.cs
+5 −9		CSharp/CSharpExpressionCompiler/Symbols/EENamedTypeSymbol.cs
+3 −1		CSharp/CSharpExpressionCompiler/Symbols/PlaceholderMethodSymbol.cs
+1 −1		CSharp/CSharpExpressionCompiler/Symbols/SynthesizedContextMethodSymbol.cs
+6 −1		Core/ExpressionCompiler/ExpressionCompiler.cs
+1 −0		Core/ExpressionCompiler/ExpressionEvaluatorFatalError.cs
+1 −0		VisualBasic/BasicExpressionCompiler/BasicExpressionCompiler.vsdconfigxml