pimhwang
/
ILSpy
mirror of https://github.com/icsharpcode/ILSpy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fix compiler warnings, and exclude the refactorings from NR.CSharp.

pull/728/head
Daniel Grunwald 11 years ago
parent
27252656cf
commit
c346f079df
6 changed files with 8 additions and 179 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      ILSpy.BamlDecompiler/ConnectMethodDecompiler.cs
  2. 5
      ILSpy/TextView/DecompilerTextView.cs
  3. 2
      Mono.Cecil/Mono.Security.Cryptography/CryptoConvert.cs
  4. 172
      NRefactory/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
  5. 2
      NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs
  6. 3
      NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs

3
ILSpy.BamlDecompiler/ConnectMethodDecompiler.cs
Unescape View File

@ -76,8 +76,7 @@ namespace ILSpy.BamlDecompiler @@ -76,8 +76,7 @@ namespace ILSpy.BamlDecompiler
} else if (condition != null) {
result.Add(1, FindEvents(condition.FalseBlock));
}
*/
return result;
return result;*/
}
/*
EventRegistration[] FindEvents(ILBlock block)

5
ILSpy/TextView/DecompilerTextView.cs
Unescape View File

@ -102,9 +102,8 @@ namespace ICSharpCode.ILSpy.TextView @@ -102,9 +102,8 @@ namespace ICSharpCode.ILSpy.TextView
textEditor.TextArea.TextView.LineTransformers.Add(textMarkerService);
textEditor.ShowLineNumbers = true;
DisplaySettingsPanel.CurrentDisplaySettings.PropertyChanged += CurrentDisplaySettings_PropertyChanged;
// Bookmarks context menu
textEditor.TextArea.DefaultInputHandler.NestedInputHandlers.Add(new SearchInputHandler(textEditor.TextArea));
SearchPanel.Install(textEditor);
ShowLineMargin();

2
Mono.Cecil/Mono.Security.Cryptography/CryptoConvert.cs
Unescape View File

@ -139,7 +139,7 @@ namespace Mono.Security.Cryptography { @@ -139,7 +139,7 @@ namespace Mono.Security.Cryptography {
rsa = RSA.Create ();
rsa.ImportParameters (rsap);
}
catch (CryptographicException ce) {
catch (CryptographicException) {
// this may cause problem when this code is run under
// the SYSTEM identity on Windows (e.g. ASP.NET). See
// http://bugzilla.ximian.com/show_bug.cgi?id=77559

172
NRefactory/ICSharpCode.NRefactory.CSharp/ICSharpCode.NRefactory.CSharp.csproj
Unescape View File

@ -263,68 +263,7 @@ @@ -263,68 +263,7 @@
<Compile Include="Parser\mcs\visit.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="QueryExpressionExpander.cs" />
<Compile Include="Refactoring\CodeActions\ConvertAsToCastAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertCastToAsAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertConditionalToIfAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertExplicitToImplicitImplementationAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertIfToConditionalAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertIfToSwitchAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertImplicitToExplicitImplementationAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertLambdaBodyExpressionToStatementAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertLambdaBodyStatementToExpressionAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertSwitchToIfAction.cs" />
<Compile Include="Refactoring\CodeActions\CreateCustomEventImplementationAction.cs" />
<Compile Include="Refactoring\CodeActions\CreateOverloadWithoutParameterAction.cs" />
<Compile Include="Refactoring\CodeActions\JoinDeclarationAndAssignmentAction.cs" />
<Compile Include="Refactoring\CodeActions\JoinStringAction.cs" />
<Compile Include="Refactoring\CodeActions\MergeNestedIfAction.cs" />
<Compile Include="Refactoring\CodeActions\NegateRelationalExpressionAction.cs" />
<Compile Include="Refactoring\CodeActions\PutInsideUsingAction.cs" />
<Compile Include="Refactoring\CodeActions\SplitDeclarationListAction.cs" />
<Compile Include="Refactoring\CodeActions\UseStringFormatAction.cs" />
<Compile Include="Refactoring\CodeIssues\AccessToClosureIssues\AccessToClosureIssue.cs" />
<Compile Include="Refactoring\CodeIssues\AccessToClosureIssues\AccessToDisposedClosureIssue.cs" />
<Compile Include="Refactoring\CodeIssues\AccessToClosureIssues\AccessToModifiedClosureIssue.cs" />
<Compile Include="Refactoring\CodeIssues\AccessToClosureIssues\LocalVariableNamePicker.cs" />
<Compile Include="Refactoring\CodeIssues\AssignmentMadeToSameVariableIssue.cs" />
<Compile Include="Refactoring\CodeIssues\BitwiseOperationOnNonFlagsEnumIssue.cs" />
<Compile Include="Refactoring\CodeIssues\CastExpressionOfIncompatibleTypeIssue.cs" />
<Compile Include="Refactoring\CodeIssues\CompareBooleanWithTrueOrFalseIssue.cs" />
<Compile Include="Refactoring\CodeIssues\CompareFloatWithEqualityOperatorIssue.cs" />
<Compile Include="Refactoring\CodeIssues\ConstantConditionIssue.cs" />
<Compile Include="Refactoring\CodeIssues\DoubleNegationIssue.cs" />
<Compile Include="Refactoring\CodeIssues\ExpressionIsAlwaysOfProvidedTypeIssue.cs" />
<Compile Include="Refactoring\CodeIssues\ExpressionIsNeverOfProvidedTypeIssue.cs" />
<Compile Include="Refactoring\CodeIssues\MethodNeverReturnsIssue.cs" />
<Compile Include="Refactoring\CodeIssues\MethodOverloadHidesOptionalParameterIssue.cs" />
<Compile Include="Refactoring\CodeIssues\NegativeRelationalExpressionIssue.cs" />
<Compile Include="Refactoring\CodeIssues\ExplicitConversionInForEachIssue.cs" />
<Compile Include="Refactoring\CodeIssues\ForControlVariableNotModifiedIssue.cs" />
<Compile Include="Refactoring\CodeIssues\IdenticalConditionalBranchIssue.cs" />
<Compile Include="Refactoring\CodeIssues\MultipleEnumerationIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantArrayInitializerCommaIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantAssignmentIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantAttributeParenthesesIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantCaseLabelIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantElseIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantFieldInitializerIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantObjectCreationArgumentListIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantObjectOrCollectionInitializerIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantTypeCastIssue.cs" />
<Compile Include="Refactoring\CodeIssues\ReferenceEqualsCalledWithValueTypeIssue.cs" />
<Compile Include="Refactoring\CodeIssues\UnreachableCodeIssue.cs" />
<Compile Include="Refactoring\CodeIssues\VariableHidesMemberIssue\LocalVariableHidesMemberIssue.cs" />
<Compile Include="Refactoring\CodeIssues\VariableHidesMemberIssue\ParameterHidesMemberIssue.cs" />
<Compile Include="Refactoring\CodeIssues\VariableHidesMemberIssue\VariableHidesMemberIssue.cs" />
<Compile Include="Refactoring\CodeIssues\VariableOnlyAssignedIssues\LocalVariableOnlyAssignedIssue.cs" />
<Compile Include="Refactoring\CodeIssues\VariableNotUsedIssues\LocalVariableNotUsedIssue.cs" />
<Compile Include="Refactoring\CodeIssues\VariableNotUsedIssues\ParameterNotUsedIssue.cs" />
<Compile Include="Refactoring\CodeIssues\TypeParameterNotUsedIssue.cs" />
<Compile Include="Refactoring\CodeIssues\VariableNotUsedIssues\VariableNotUsedIssue.cs" />
<Compile Include="Refactoring\CodeIssues\VariableOnlyAssignedIssues\ParameterOnlyAssignedIssue.cs" />
<Compile Include="Refactoring\CodeIssues\VariableOnlyAssignedIssues\VariableOnlyAssignedIssue.cs" />
<Compile Include="Refactoring\DocumentScript.cs" />
<Compile Include="Refactoring\CodeActions\ExtractAnonymousMethodAction.cs" />
<Compile Include="Refactoring\LambdaHelper.cs" />
<Compile Include="Refactoring\PatternHelper.cs" />
<Compile Include="Refactoring\RefactoringAstHelper.cs" />
@ -356,8 +295,6 @@ @@ -356,8 +295,6 @@
<Compile Include="Resolver\ResolveAtLocation.cs" />
<Compile Include="Resolver\ResolveVisitor.cs" />
<Compile Include="Resolver\TypeInference.cs" />
<Compile Include="Completion\ICompletionDataFactory.cs" />
<Compile Include="Completion\IParameterCompletionDataFactory.cs" />
<Compile Include="NameLookupMode.cs" />
<Compile Include="TypeSystem\AliasNamespaceReference.cs" />
<Compile Include="TypeSystem\AttributeTypeReference.cs" />
@ -377,10 +314,6 @@ @@ -377,10 +314,6 @@
<Compile Include="TypeSystem\UsingScope.cs" />
<Compile Include="Ast\GeneralScope\PreProcessorDirective.cs" />
<Compile Include="Ast\Expressions\ErrorExpression.cs" />
<Compile Include="Completion\CompletionDataWrapper.cs" />
<Compile Include="Completion\CSharpCompletionEngine.cs" />
<Compile Include="Completion\CSharpCompletionEngineBase.cs" />
<Compile Include="Completion\CSharpParameterCompletionEngine.cs" />
<Compile Include="Parser\mcs\module.cs" />
<Compile Include="Parser\mcs\settings.cs" />
<Compile Include="Parser\mcs\SourceMethodBuilder.cs" />
@ -393,111 +326,15 @@ @@ -393,111 +326,15 @@
<Compile Include="Refactoring\ICodeIssueProvider.cs" />
<Compile Include="Refactoring\ContextActionAttribute.cs" />
<Compile Include="Refactoring\IssueAttribute.cs" />
<Compile Include="Refactoring\CodeIssues\IssueCategories.cs" />
<Compile Include="Refactoring\Severity.cs" />
<Compile Include="Refactoring\IssueMarker.cs" />
<Compile Include="Refactoring\CodeIssues\GatherVisitorBase.cs" />
<Compile Include="Refactoring\CodeIssues\ConditionalToNullCoalescingIssue.cs" />
<Compile Include="Refactoring\CodeIssues\NotImplementedExceptionIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantInternalIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantNamespaceUsageIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantPrivateIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantThisIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantUsingIssue.cs" />
<Compile Include="Refactoring\CodeIssues\StringIsNullOrEmptyIssue.cs" />
<Compile Include="Refactoring\CodeIssues\UseVarKeywordIssue.cs" />
<Compile Include="Refactoring\CodeActions\UseVarKeywordAction.cs" />
<Compile Include="Refactoring\CodeActions\UseExplicitTypeAction.cs" />
<Compile Include="Refactoring\CodeActions\SplitStringAction.cs" />
<Compile Include="Refactoring\CodeActions\SplitDeclarationAndAssignmentAction.cs" />
<Compile Include="Refactoring\CodeActions\ReplaceEmptyStringAction.cs" />
<Compile Include="Refactoring\CodeActions\RemoveRegionAction.cs" />
<Compile Include="Refactoring\CodeActions\RemoveBracesAction.cs" />
<Compile Include="Refactoring\CodeActions\RemoveBackingStoreAction.cs" />
<Compile Include="Refactoring\CodeActions\InvertIfAction.cs" />
<Compile Include="Refactoring\CodeActions\IntroduceFormatItemAction.cs" />
<Compile Include="Refactoring\CodeActions\InsertAnonymousMethodSignatureAction.cs" />
<Compile Include="Refactoring\CodeActions\GenerateSwitchLabelsAction.cs" />
<Compile Include="Refactoring\CodeActions\GeneratePropertyAction.cs" />
<Compile Include="Refactoring\CodeActions\GenerateGetterAction.cs" />
<Compile Include="Refactoring\CodeActions\FlipOperatorArgumentsAction.cs" />
<Compile Include="Refactoring\CodeActions\CreatePropertyAction.cs" />
<Compile Include="Refactoring\CodeActions\CreateLocalVariableAction.cs" />
<Compile Include="Refactoring\CodeActions\CreateFieldAction.cs" />
<Compile Include="Refactoring\CodeActions\CreateEventInvocatorAction.cs" />
<Compile Include="Refactoring\CodeActions\CreateBackingStoreAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertHexToDecAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertForeachToForAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertDecToHexAction.cs" />
<Compile Include="Refactoring\CodeActions\CheckIfParameterIsNullAction.cs" />
<Compile Include="Refactoring\CodeActions\AddAnotherAccessorAction.cs" />
<Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\NamingStyle.cs" />
<Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\NamingRule.cs" />
<Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\AffectedEntity.cs" />
<Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\DefaultRules.cs" />
<Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\InconsistentNamingIssue.cs" />
<Compile Include="Refactoring\CodeActions\CreateMethodDeclarationAction.cs" />
<Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\NamingConventionService.cs" />
<Compile Include="Refactoring\CodeActions\CreateIndexerAction.cs" />
<Compile Include="Refactoring\CodeActions\InlineLocalVariableAction.cs" />
<Compile Include="Refactoring\CodeActions\DeclareLocalVariableAction.cs" />
<Compile Include="Refactoring\CodeIssues\InconsistentNamingIssue\WordParser.cs" />
<Compile Include="Refactoring\CodeActions\CreateConstructorDeclarationAction.cs" />
<Compile Include="Refactoring\CodeActions\CreateClassDeclarationAction.cs" />
<Compile Include="Refactoring\CodeActions\CreateDelegateAction.cs" />
<Compile Include="Formatter\TextEditorOptions.cs" />
<Compile Include="Refactoring\CodeActions\IntroduceConstantAction.cs" />
<Compile Include="Refactoring\CodeActions\ExtractMethod\ExtractMethodAction.cs" />
<Compile Include="Refactoring\CodeActions\ExtractMethod\StaticVisitor.cs" />
<Compile Include="Refactoring\CodeActions\ExtractMethod\VariableLookupVisitor.cs" />
<Compile Include="Refactoring\CodeActions\SpecializedCodeAction.cs" />
<Compile Include="Formatter\GeneratedCodeSettings.cs" />
<Compile Include="Ast\GeneralScope\NewLineNode.cs" />
<Compile Include="Ast\GeneralScope\WhitespaceNode.cs" />
<Compile Include="Ast\GeneralScope\TextNode.cs" />
<Compile Include="Formatter\FormattingOptionsFactory.cs" />
<Compile Include="Refactoring\CodeActions\ImplementInterfaceAction.cs" />
<Compile Include="Refactoring\CodeActions\ImplementInterfaceExplicitAction.cs" />
<Compile Include="Refactoring\CodeActions\ImplementAbstractMembersAction.cs" />
<Compile Include="Refactoring\CodeActions\RemoveRedundantCatchTypeAction.cs" />
<Compile Include="Refactoring\CodeActions\AddCatchTypeAction.cs" />
<Compile Include="Refactoring\CodeIssues\IncorrectExceptionParameterOrderingIssue.cs" />
<Compile Include="Refactoring\CodeIssues\CallToVirtualFunctionFromConstructorIssue.cs" />
<Compile Include="Refactoring\CodeActions\StaticMethodInvocationToExtensionMethodInvocationAction.cs" />
<Compile Include="Refactoring\CodeActions\ExtensionMethodInvocationToStaticMethodInvocationAction.cs" />
<Compile Include="Refactoring\CodeActions\IterateViaForeachAction.cs" />
<Compile Include="Refactoring\CodeActions\ExtractFieldAction.cs" />
<Compile Include="Completion\ICompletionContextProvider.cs" />
<Compile Include="Refactoring\CodeIssues\ValueParameterUnusedIssue.cs" />
<Compile Include="Refactoring\NamingHelper.cs" />
<Compile Include="Refactoring\CodeActions\ConvertToInitializer\ConvertToInitializerAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertToInitializer\StatementsToInitializerConverter.cs" />
<Compile Include="Refactoring\CodeActions\ConvertToInitializer\InitializerPath.cs" />
<Compile Include="Refactoring\CodeActions\MoveToOuterScopeAction.cs" />
<Compile Include="Refactoring\CodeIssues\VariableDeclaredInWideScopeIssue.cs" />
<Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\ParameterCanBeDemotedIssue.cs" />
<Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\ITypeCriterion.cs" />
<Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\HasMemberCriterion.cs" />
<Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\TypeCriteriaCollector.cs" />
<Compile Include="Refactoring\CodeIssues\ReferenceToStaticMemberViaDerivedTypeIssue.cs" />
<Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\IsTypeCriterion.cs" />
<Compile Include="Refactoring\CodeIssues\OptionalParameterCouldBeSkippedIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantCatchIssue.cs" />
<Compile Include="Refactoring\CodeIssues\RedundantToStringIssue.cs" />
<Compile Include="Refactoring\CodeIssues\CallToObjectEqualsViaBaseIssue.cs" />
<Compile Include="Refactoring\CodeIssues\IncorrectCallToObjectGetHashCodeIssue.cs" />
<Compile Include="Refactoring\CodeActions\ExtractMethod\VariableUsageAnalyzation.cs" />
<Compile Include="Refactoring\CodeIssues\FormatStringIssues\FormatStringIssue.cs" />
<Compile Include="Refactoring\CodeIssues\FormatStringIssues\FormatStringHelper.cs" />
<Compile Include="Refactoring\CodeActions\ConvertToInitializer\ConvertInitializerToExplicitInitializationsAction.cs" />
<Compile Include="Refactoring\CodeIssues\ExceptionRethrowIssue.cs" />
<Compile Include="Refactoring\CodeIssues\ThreadStaticOnInstanceFieldIssue.cs" />
<Compile Include="Refactoring\CodeIssues\StaticFieldInGenericTypeIssue.cs" />
<Compile Include="Parser\SeekableStreamReader.cs" />
<Compile Include="Refactoring\CodeActions\ConvertAnonymousDelegateToLambdaAction.cs" />
<Compile Include="Refactoring\CodeActions\ConvertLambdaToAnonymousDelegateAction.cs" />
<Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\IsArrayTypeCriterion.cs" />
<Compile Include="Refactoring\CodeIssues\ParameterCanBeDemotedIssue\SupportsIndexingCriterion.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj">
@ -506,14 +343,7 @@ @@ -506,14 +343,7 @@
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildBinPath)\Microsoft.CSharp.Targets" />
<ItemGroup>
<Folder Include="Completion\" />
<Folder Include="Refactoring\CodeIssues\" />
<Folder Include="Refactoring\CodeIssues\InconsistentNamingIssue\" />
<Folder Include="Refactoring\CodeActions\ExtractMethod\" />
<Folder Include="Refactoring\CodeActions\ConvertToInitializer\" />
<Folder Include="Refactoring\CodeIssues\FormatStringIssues\" />
</ItemGroup>
<ItemGroup />
<ProjectExtensions>
<MonoDevelop>
<Properties>

2
NRefactory/ICSharpCode.NRefactory.VB/Visitors/CSharpToVBConverterVisitor.cs
Unescape View File

@ -800,7 +800,7 @@ namespace ICSharpCode.NRefactory.VB.Visitors @@ -800,7 +800,7 @@ namespace ICSharpCode.NRefactory.VB.Visitors
throw new NotImplementedException();
return EndNode(queryGroupClause, op);
//return EndNode(queryGroupClause, op);
}
public AstNode VisitAttribute(CSharp.Attribute attribute, object data)

3
NRefactory/ICSharpCode.NRefactory/TypeSystem/CecilLoader.cs
Unescape View File

@ -77,7 +77,7 @@ namespace ICSharpCode.NRefactory.TypeSystem @@ -77,7 +77,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
/// Gets/Sets the cancellation token used by the cecil loader.
/// </summary>
public CancellationToken CancellationToken { get; set; }
/// <summary>
/// This delegate gets executed whenever an entity was loaded.
/// </summary>
@ -87,6 +87,7 @@ namespace ICSharpCode.NRefactory.TypeSystem @@ -87,6 +87,7 @@ namespace ICSharpCode.NRefactory.TypeSystem
/// Warning: if delay-loading is used and the type system is accessed by multiple threads,
/// the callback may be invoked concurrently on multiple threads.
/// </remarks>
[CLSCompliant(false)]
public Action<IUnresolvedEntity, MemberReference> OnEntityLoaded { get; set; }
/// <summary>

Write Preview
Loading…
Cancel
Save