Upgrade dotnet-format from version 5 to the version included with the…

… .NET (6) SDK.
clin1234 · Jul 16, 2022 · 9b38aef · 9b38aef
1 parent 8818cc4
commit 9b38aef
Show file tree

Hide file tree

Showing 9 changed files with 48 additions and 84 deletions.
diff --git a/.github/workflows/build-ilspy.yml b/.github/workflows/build-ilspy.yml
@@ -30,9 +30,6 @@ jobs:
     - name: Add msbuild to PATH
       uses: microsoft/setup-msbuild@v1.1
 
-    - name: Install dotnet-format
-      run: dotnet tool install dotnet-format --global --version 5.1.225507
-
     - name: Get Version
       id: version
       shell: pwsh
@@ -67,7 +64,7 @@ jobs:
         paths: "test-results/${{ matrix.configuration }}.xml"
 
     - name: Format check
-      run: python BuildTools\tidy.py
+      run: dotnet format whitespace --verify-no-changes --verbosity detailed
 
     - name: Verify package contents
       if: matrix.configuration == 'debug'

diff --git a/BuildTools/pre-commit b/BuildTools/pre-commit
@@ -0,0 +1,10 @@
+#!/bin/sh
+#
+# To enable this hook, copy/symlink this file to ".git/hooks/pre-commit".
+
+#if git diff --quiet --ignore-submodules; then
+#	dotnet format whitespace --no-restore --verbosity detailed ILSpy.sln
+#	git add -u -- \*\*.cs
+#else
+	exec dotnet format whitespace --verify-no-changes --no-restore --verbosity detailed ILSpy.sln
+#fi
diff --git a/BuildTools/tidy.py b/BuildTools/tidy.py
diff --git a/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs b/ICSharpCode.Decompiler/CSharp/OutputVisitor/CSharpOutputVisitor.cs
@@ -733,8 +733,7 @@ bool IsSimpleExpression(Expression ex)
 					case ThisReferenceExpression _:
 					case PrimitiveExpression _:
 					case IdentifierExpression _:
-					case MemberReferenceExpression
-					{
+					case MemberReferenceExpression {
 						Target: ThisReferenceExpression
 							or IdentifierExpression
 							or BaseReferenceExpression

diff --git a/ICSharpCode.Decompiler/CSharp/RecordDecompiler.cs b/ICSharpCode.Decompiler/CSharp/RecordDecompiler.cs
@@ -476,11 +476,10 @@ private bool IsGeneratedPrintMembers(IMethod method)
 				return false;
 			int pos = 0;
 			//Roslyn 4.0.0-3.final start to insert an call to RuntimeHelpers.EnsureSufficientExecutionStack()
-			if (!isStruct && !isInheritedRecord && body.Instructions[pos] is Call
-				{
-					Arguments: { Count: 0 },
-					Method: { Name: "EnsureSufficientExecutionStack", DeclaringType: { Namespace: "System.Runtime.CompilerServices", Name: "RuntimeHelpers" } }
-				})
+			if (!isStruct && !isInheritedRecord && body.Instructions[pos] is Call {
+				Arguments: { Count: 0 },
+				Method: { Name: "EnsureSufficientExecutionStack", DeclaringType: { Namespace: "System.Runtime.CompilerServices", Name: "RuntimeHelpers" } }
+			})
 			{
 				pos++;
 			}
@@ -924,19 +923,17 @@ bool IsGeneratedGetHashCode(IMethod method)
 
 			bool Visit(ILInstruction inst)
 			{
-				if (inst is BinaryNumericInstruction
-					{
-						Operator: BinaryNumericOperator.Add,
+				if (inst is BinaryNumericInstruction {
+					Operator: BinaryNumericOperator.Add,
+					CheckForOverflow: false,
+					Left: BinaryNumericInstruction {
+						Operator: BinaryNumericOperator.Mul,
 						CheckForOverflow: false,
-						Left: BinaryNumericInstruction
-						{
-							Operator: BinaryNumericOperator.Mul,
-							CheckForOverflow: false,
-							Left: var left,
-							Right: LdcI4 { Value: -1521134295 }
-						},
-						Right: var right
-					})
+						Left: var left,
+						Right: LdcI4 { Value: -1521134295 }
+					},
+					Right: var right
+				})
 				{
 					if (!Visit(left))
 						return false;
@@ -1039,14 +1036,12 @@ bool MatchMemberAccess(ILInstruction inst, out ILInstruction target, out IMember
 		{
 			target = null;
 			member = null;
-			if (inst is CallInstruction
-				{
-					Method:
-					{
-						AccessorKind: System.Reflection.MethodSemanticsAttributes.Getter,
-						AccessorOwner: IProperty property
-					}
-				} call && (call is CallVirt || (isSealed && call is Call)))
+			if (inst is CallInstruction {
+				Method: {
+					AccessorKind: System.Reflection.MethodSemanticsAttributes.Getter,
+					AccessorOwner: IProperty property
+				}
+			} call && (call is CallVirt || (isSealed && call is Call)))
 			{
 				if (call.Arguments.Count != 1)
 					return false;

diff --git a/ICSharpCode.Decompiler/IL/Transforms/InterpolatedStringTransform.cs b/ICSharpCode.Decompiler/IL/Transforms/InterpolatedStringTransform.cs
@@ -33,11 +33,10 @@ void IStatementTransform.Run(Block block, int pos, StatementTransformContext con
 			int interpolationEnd;
 			ILInstruction insertionPoint;
 			// stloc v(newobj DefaultInterpolatedStringHandler..ctor(ldc.i4 literalLength, ldc.i4 formattedCount))
-			if (block.Instructions[pos] is StLoc
-				{
-					Variable: ILVariable { Kind: VariableKind.Local } v,
-					Value: NewObj { Arguments: { Count: 2 } } newObj
-				} stloc
+			if (block.Instructions[pos] is StLoc {
+				Variable: ILVariable { Kind: VariableKind.Local } v,
+				Value: NewObj { Arguments: { Count: 2 } } newObj
+			} stloc
 				&& v.Type.IsKnownType(KnownTypeCode.DefaultInterpolatedStringHandler)
 				&& newObj.Method.DeclaringType.IsKnownType(KnownTypeCode.DefaultInterpolatedStringHandler)
 				&& newObj.Arguments[0].MatchLdcI4(out _)
@@ -122,8 +121,7 @@ private bool FindToStringAndClear(Block block, int pos, int interpolationStart,
 				Debug.Assert(insertionPoint == result.LoadInst.Parent);
 			}
 
-			return insertionPoint is Call
-			{
+			return insertionPoint is Call {
 				Arguments: { Count: 1 },
 				Method: { Name: "ToStringAndClear", IsStatic: false }
 			};

diff --git a/ICSharpCode.Decompiler/IL/Transforms/RemoveInfeasiblePathTransform.cs b/ICSharpCode.Decompiler/IL/Transforms/RemoveInfeasiblePathTransform.cs
@@ -79,11 +79,10 @@ private bool MatchBlock1(Block block, [NotNullWhen(true)] out ILVariable? variab
 			branch = null;
 			if (block.Instructions.Count != 2)
 				return false;
-			if (block.Instructions[0] is not StLoc
-				{
-					Variable: { Kind: VariableKind.StackSlot } s,
-					Value: LdcI4 { Value: 0 or 1 } valueInst
-				})
+			if (block.Instructions[0] is not StLoc {
+				Variable: { Kind: VariableKind.StackSlot } s,
+				Value: LdcI4 { Value: 0 or 1 } valueInst
+			})
 			{
 				return false;
 			}

diff --git a/ICSharpCode.Decompiler/IL/Transforms/UsingTransform.cs b/ICSharpCode.Decompiler/IL/Transforms/UsingTransform.cs
@@ -389,13 +389,12 @@ bool MatchNullCheckOrTypeCheck(ILInstruction condition, ref ILVariable objVar, K
 					return false;
 				return true;
 			}
-			if (condition is MatchInstruction
-				{
-					CheckNotNull: true,
-					CheckType: true,
-					TestedOperand: LdLoc { Variable: var v },
-					Variable: var newObjVar
-				})
+			if (condition is MatchInstruction {
+				CheckNotNull: true,
+				CheckType: true,
+				TestedOperand: LdLoc { Variable: var v },
+				Variable: var newObjVar
+			})
 			{
 				if (v != objVar)
 					return false;

diff --git a/TestPlugin/Properties/AssemblyInfo.cs b/TestPlugin/Properties/AssemblyInfo.cs
@@ -15,4 +15,4 @@
 
 // This sets the default COM visibility of types in the assembly to invisible.
 // If you need to expose a type to COM, use [ComVisible(true)] on that type.
-[assembly: ComVisible(false)]
+[assembly: ComVisible(false)]