Migrate to R#10 SDK.

SergeyTeplyakov · Jan 24, 2016 · b9c69f6 · b9c69f6
1 parent be72ca7
commit b9c69f6
Show file tree

Hide file tree

Showing 11 changed files with 174 additions and 144 deletions.
diff --git a/ContractExtensions.nuspec b/ContractExtensions.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
   <metadata>
     <id>ReSharper.ContractExtensions</id>
-    <version>0.9.2.5</version>
+    <version>0.10.0.1</version>
     <!-- update plugin ver in AssemblyInfo.cs plz -->
     <title>Code Contract editing extensions</title>
     <authors>Sergey Teplyakov, https://github.com/Diagonactic</authors>
@@ -15,9 +15,11 @@
       Detects Code Contract error/warnings in the IDE.
     </description>
 	<dependencies>
-		<dependency id="Wave" version="[3.0, 4.0)" />
+           <dependency id="Wave" version="[4.0,4.1)" />
 	</dependencies>
     <releaseNotes>
+*What's new in 0.10.0.1*
+Support for R# 10
 
 *What's new in 0.9.2.4*
 Updated to API for ReSharper 9.2

diff --git a/ContractExtensions/ContextActions/ContractsFor/AddContractClassExecutor.cs b/ContractExtensions/ContextActions/ContractsFor/AddContractClassExecutor.cs
@@ -94,8 +94,7 @@ private void AddContractClassForAttributeTo(IClassDeclaration contractClass)
         private IAttribute CreateExcludeFromCodeCoverageAttribute()
         {
             ITypeElement type = TypeFactory.CreateTypeByCLRName(
-                typeof(ExcludeFromCodeCoverageAttribute).FullName,
-                _provider.PsiModule, _currentFile.GetResolveContext()).GetTypeElement();
+                typeof(ExcludeFromCodeCoverageAttribute).FullName, _provider.PsiModule).GetTypeElement();
 
             return _factory.CreateAttribute(type);
         }
@@ -342,8 +341,7 @@ private string GenerateUniqueContractClassName()
         private IAttribute CreateContractClassAttribute(IClassDeclaration contractClass)
         {
             ITypeElement attributeType = TypeFactory.CreateTypeByCLRName(
-                typeof(ContractClassAttribute).FullName,
-                _provider.PsiModule, _currentFile.GetResolveContext()).GetTypeElement();
+                typeof(ContractClassAttribute).FullName, _provider.PsiModule).GetTypeElement();
 
             var declaredType = contractClass.DeclaredElement;
             var typeofExpression = _factory.CreateExpression("typeof($0)", declaredType);
@@ -362,8 +360,7 @@ private IAttribute CreateContractClassForAttribute(IClassLikeDeclaration contrac
         {
             var declaredType = _addContractForAvailability.DeclaredType.GetTypeElement();
             ITypeElement type = TypeFactory.CreateTypeByCLRName(
-                typeof(ContractClassForAttribute).FullName,
-                _provider.PsiModule, _currentFile.GetResolveContext()).GetTypeElement();
+                typeof(ContractClassForAttribute).FullName, _provider.PsiModule).GetTypeElement();
 
             var expression = _factory.CreateExpression("typeof($0)", declaredType);
 

diff --git a/ContractExtensions/ContextActions/Infrastructure/ContextActionExecutorBase.cs b/ContractExtensions/ContextActions/Infrastructure/ContextActionExecutorBase.cs
@@ -10,7 +10,6 @@
 using JetBrains.ReSharper.Psi.Impl.Types;
 using JetBrains.ReSharper.Psi.Modules;
 using JetBrains.ReSharper.Psi.Tree;
-using JetBrains.Util.Lazy;
 
 namespace ReSharper.ContractExtensions.ContextActions.Infrastructure
 {
@@ -82,8 +81,7 @@ protected ITypeElement CreateDeclaredType(IClrTypeName clrTypeName)
             Contract.Requires(clrTypeName != null);
             Contract.Ensures(Contract.Result<ITypeElement>() != null);
 
-            return new DeclaredTypeFromCLRName(clrTypeName, _psiModule, _currentFile.GetResolveContext())
-                .GetTypeElement();
+            return new DeclaredTypeFromCLRName(clrTypeName, _psiModule).GetTypeElement();
         }
 
         [Pure]
@@ -99,8 +97,7 @@ protected ITypeElement CreateDeclaredType(System.Type type)
         protected PredefinedType GetPredefinedType()
         {
             Contract.Ensures(Contract.Result<PredefinedType>() != null);
-            return _psiModule.GetPredefinedType(
-                _currentFile.GetResolveContext());
+            return _psiModule.GetPredefinedType();
         }
 
         public ITypeElement ContractType

diff --git a/ContractExtensions/ContextActions/Invariants/InvariantActionExecutor.cs b/ContractExtensions/ContextActions/Invariants/InvariantActionExecutor.cs
@@ -125,8 +125,7 @@ private IMethodDeclaration AddObjectInvariantMethodIfNecessary()
         private void AddContractInvariantAttribute(IMethodDeclaration method)
         {
             ITypeElement type = TypeFactory.CreateTypeByCLRName(
-                typeof(ContractInvariantMethodAttribute).FullName,
-                _provider.PsiModule, _currentFile.GetResolveContext()).GetTypeElement();
+                typeof(ContractInvariantMethodAttribute).FullName, _provider.PsiModule).GetTypeElement();
 
             var attribute = _factory.CreateAttribute(type);
 

diff --git a/ContractExtensions/ContractsEx/Validation/Statements/CodeContractStatement.cs b/ContractExtensions/ContractsEx/Validation/Statements/CodeContractStatement.cs
@@ -30,7 +30,7 @@ public sealed class CodeContractStatement : ContractStatement
         /// </summary>
         private readonly IInvocationExpression _invocationExpression;
         private readonly CodeContractStatementType _statementType;
-        private JetBrains.Util.Lazy.Lazy<CodeContractAssertion> _codeContractExpression;
+        private System.Lazy<CodeContractAssertion> _codeContractExpression;
 
         private CodeContractStatement(ICSharpStatement statement, 
             IInvocationExpression invocationExpression,
@@ -44,8 +44,8 @@ private CodeContractStatement(ICSharpStatement statement,
 
             // Due to weird bug in CC compiler, I can't use the same variable in Contract.Requires
             // and in lambda expression.
-            _codeContractExpression = JetBrains.Util.Lazy.Lazy.Of(
-                () => Assertions.ContractStatementFactory.TryCreateAssertion(_invocationExpression));
+            _codeContractExpression = JetBrains.Util.Lazy.Of(
+                () => Assertions.ContractStatementFactory.TryCreateAssertion(_invocationExpression), true);
         }
 
         public CodeContractStatementType StatementType
@@ -61,8 +61,8 @@ public bool IsPostcondition
                        StatementType == CodeContractStatementType.EnsuresOnThrow;
             }
         }
-
-        public JetBrains.Util.Lazy.Lazy<CodeContractAssertion> CodeContractExpression
+        
+        public Lazy<CodeContractAssertion> CodeContractExpression
         {
             get
             {