Skip to content

Commit

Permalink
Support 2016.3 RTM
Browse files Browse the repository at this point in the history
  • Loading branch information
@citizenmatt
citizenmatt committed Dec 23, 2016
1 parent 0d3cc36 commit ecb551a
Show file tree
Hide file tree
Showing 14 changed files with 526 additions and 1,276 deletions.
7 changes: 5 additions & 2 deletions install/resharper-angularjs.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<metadata>
<id>JetBrains.AngularJS</id>
<title>AngularJS</title>
<version>1.6.2</version>
<version>1.7.0</version>
<authors>JetBrains</authors>
<owners>JetBrains</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
Expand All @@ -12,6 +12,9 @@
<iconUrl>https://raw.github.com/JetBrains/resharper-angularjs/master/icon.png</iconUrl>
<description>Code completion and live templates for AngularJS</description>
<releaseNotes>
&#8226; Updated to ReSharper 2016.3

From 1.6.1:
&#8226; Address performance issue with many directives.

From 1.6.1:
Expand Down Expand Up @@ -40,7 +43,7 @@ From 1.2.2:
&#8226; Added angular icons to the code completion items
</releaseNotes>
<dependencies>
<dependency id="Wave" version="[6.0]" />
<dependency id="Wave" version="[7.0]" />
</dependencies>
<tags>resharper angular angularjs javascript js typescript</tags>
</metadata>
Expand Down
58 changes: 0 additions & 58 deletions install/resharper-angularjs.wave07.nuspec
View file

This file was deleted.

5 changes: 0 additions & 5 deletions src/packages/repositories.config
View file

This file was deleted.

12 changes: 0 additions & 12 deletions src/resharper-angularjs.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "resharper-angularjs", "resh
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests", "..\test\src\test.resharper-angularjs\tests.csproj", "{8E0BE7C0-CB94-4993-94F3-A91961F8A809}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "resharper-angularjs.wave07", "resharper-angularjs\resharper-angularjs.wave07.csproj", "{F50A2291-6669-4B1B-AF18-A63FDE7F9649}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests.wave07", "..\test\src\test.resharper-angularjs\tests.wave07.csproj", "{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -25,14 +21,6 @@ Global
{8E0BE7C0-CB94-4993-94F3-A91961F8A809}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8E0BE7C0-CB94-4993-94F3-A91961F8A809}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8E0BE7C0-CB94-4993-94F3-A91961F8A809}.Release|Any CPU.Build.0 = Release|Any CPU
{F50A2291-6669-4B1B-AF18-A63FDE7F9649}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F50A2291-6669-4B1B-AF18-A63FDE7F9649}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F50A2291-6669-4B1B-AF18-A63FDE7F9649}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F50A2291-6669-4B1B-AF18-A63FDE7F9649}.Release|Any CPU.Build.0 = Release|Any CPU
{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
4 changes: 0 additions & 4 deletions src/resharper-angularjs/Feature/Services/Caches/JsDocFileProcessor.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -57,11 +57,7 @@ public void ProcessJsDocFile(IJsDocFile jsDocFile)
if (!string.IsNullOrEmpty(name))
name = name.Substring(name.IndexOf(':') + 1);

#if WAVE07
var nameOffset = nameTag.GetDocumentStartOffset().Offset;
#else
var nameOffset = nameTag.GetDocumentStartOffset().TextRange.StartOffset;
#endif

var ngdocValue = ngdocTag.DescriptionText;
if (!string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(ngdocValue))
Expand Down
4 changes: 2 additions & 2 deletions src/resharper-angularjs/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,10 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("JetBrains")]
[assembly: AssemblyProduct("resharper-angularjs")]
[assembly: AssemblyCopyright("Copyright © JetBrains, 2013")]
[assembly: AssemblyCopyright("Copyright © JetBrains, 2016")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

// Use a static version value so that ReSharper Build won't rebuild referencing assemblies
[assembly: AssemblyVersion("1.6.3.0")]
[assembly: AssemblyVersion("1.7.0.0")]

114 changes: 58 additions & 56 deletions src/resharper-angularjs/packages.config
View file
Original file line number Diff line number Diff line change
@@ -1,59 +1,61 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net40" />
<package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net40" />
<package id="AsyncBridge.JetBrains" version="0.1.1.0" targetFramework="net40" />
<package id="AsyncIO" version="0.1.18.0" targetFramework="net40" />
<package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net40" />
<package id="JetBrains.Annotations" version="10.1.5" targetFramework="net40" />
<package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20151217.1" targetFramework="net40" developmentDependency="true" />
<package id="JetBrains.ExternalAnnotations" version="10.2.0" targetFramework="net40" />
<package id="JetBrains.Mono.Posix" version="0.1" targetFramework="net40" />
<package id="JetBrains.Platform.Core.Ide" version="106.0.20160818.163532" targetFramework="net40" />
<package id="JetBrains.Platform.Core.Shell" version="106.0.20160818.163301" targetFramework="net40" />
<package id="JetBrains.Platform.Core.Text" version="106.0.20160818.163532" targetFramework="net40" />
<package id="JetBrains.Platform.Installer" version="106.0.20160818.163532" targetFramework="net40" />
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Framework" version="106.0.20160818.163532" targetFramework="net40" />
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="106.0.20160818.163532" targetFramework="net40" />
<package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20150224.0" targetFramework="net40" />
<package id="JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab" version="2.0.20140304.0" targetFramework="net40" />
<package id="JetBrains.Platform.Lib.Microsoft.Deployment.WindowsInstaller" version="2.0.20140821.0" targetFramework="net40" />
<package id="JetBrains.Platform.Lib.System.Windows.Interactivity" version="2.0.20140318.0" targetFramework="net40" />
<package id="JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild" version="2.0.20140304.0" targetFramework="net40" />
<package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20150225.0" targetFramework="net40" />
<package id="JetBrains.Platform.RdProtocol" version="106.0.20160818.163532" targetFramework="net40" />
<package id="JetBrains.Platform.Symbols" version="106.0.20160818.163532" targetFramework="net40" />
<package id="JetBrains.Platform.Tests.Framework" version="106.0.20160818.163532" targetFramework="net40" />
<package id="JetBrains.Platform.VisualStudio" version="106.0.20160818.163532" targetFramework="net40" />
<package id="JetBrains.Psi.Features.Core" version="106.0.20160818.164034" targetFramework="net40" />
<package id="JetBrains.Psi.Features.Cpp.Src" version="106.0.20160818.165003" targetFramework="net40" />
<package id="JetBrains.Psi.Features.SolutionBuilder" version="106.0.20160818.164034" targetFramework="net40" />
<package id="JetBrains.Psi.Features.src" version="106.0.20160818.164034" targetFramework="net40" />
<package id="JetBrains.Psi.Features.Tasks" version="106.0.20160818.164034" targetFramework="net40" />
<package id="JetBrains.Psi.Features.test.Framework" version="106.0.20160818.164034" targetFramework="net40" />
<package id="JetBrains.Psi.Features.UnitTesting" version="106.0.20160818.164034" targetFramework="net40" />
<package id="JetBrains.Psi.Features.VisualStudio" version="106.0.20160818.164034" targetFramework="net40" />
<package id="JetBrains.ReSharper.SDK" version="2016.2.20160818.171542" targetFramework="net40" developmentDependency="true" />
<package id="JetBrains.ReSharper.SDK.Internal" version="106.0.20160818.171542" targetFramework="net40" />
<package id="JetBrains.WinDbg.SymStore" version="10.0.10586.20151201" targetFramework="net40" developmentDependency="true" />
<package id="Microsoft.VC100.CRT.JetBrains" version="10.00.40219.2" targetFramework="net40" />
<package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net40" />
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
<package id="NetMQ" version="3.3.3.1" targetFramework="net40" />
<package id="Newtonsoft35.Json" version="7.0.1" targetFramework="net40" />
<package id="NuGet.Core" version="2.12.0" targetFramework="net40" />
<package id="NuGet.Core.Ultimate" version="3.3.2" targetFramework="net40" />
<package id="NUnit" version="2.6.4" targetFramework="net40" />
<package id="NUnit.ReSharperRunner2" version="2.6.408" targetFramework="net40" />
<package id="NUnit.ReSharperRunner3" version="3.0.12" targetFramework="net40" />
<package id="NVelocity" version="1.0.3" targetFramework="net40" />
<package id="SharpZipLib.JetBrains.Stripped" version="0.86.20150204.1" targetFramework="net40" />
<package id="Sprache.JetBrains" version="2.0.0.44" targetFramework="net40" />
<package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net40" />
<package id="Wave" version="6.0.0.0" targetFramework="net40" />
<package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net40" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net40" />
<package id="xunit.abstractions.JetBrains" version="2.0.0" targetFramework="net40" />
<package id="xunit.JetBrains" version="1.9.2" targetFramework="net40" />
<package id="xunit.runner.utility.JetBrains" version="2.2.0" targetFramework="net40" />
<package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net45" />
<package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net45" />
<package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net45" />
<package id="ICSharpCode.NRefactory" version="5.5.1" targetFramework="net45" />
<package id="JetBrains.Annotations" version="10.2.1" targetFramework="net45" />
<package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20151217.1" targetFramework="net45" developmentDependency="true" />
<package id="JetBrains.ExternalAnnotations" version="10.2.5" targetFramework="net45" />
<package id="JetBrains.MSBuild.Xplat.Engine" version="20161013.1.0" targetFramework="net45" />
<package id="JetBrains.NuGet.Core" version="2.13.0" targetFramework="net45" />
<package id="JetBrains.NuGet.Ultimate" version="3.5.0.1" targetFramework="net45" />
<package id="JetBrains.Platform.Core.Ide" version="107.0.20161214.153643" targetFramework="net45" />
<package id="JetBrains.Platform.Core.Shell" version="107.0.20161214.153252" targetFramework="net45" />
<package id="JetBrains.Platform.Core.Text" version="107.0.20161214.153643" targetFramework="net45" />
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Framework" version="107.0.20161214.153643" targetFramework="net45" />
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="107.0.20161214.153643" targetFramework="net45" />
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop.Ide" version="107.0.20161214.153643" targetFramework="net45" />
<package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20150224.0" targetFramework="net45" />
<package id="JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab" version="2.0.20140304.0" targetFramework="net45" />
<package id="JetBrains.Platform.Lib.System.Windows.Interactivity" version="2.0.20140318.0" targetFramework="net45" />
<package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20150225.0" targetFramework="net45" />
<package id="JetBrains.Platform.RdProtocol" version="107.0.20161214.153643" targetFramework="net45" />
<package id="JetBrains.Platform.Symbols" version="107.0.20161214.153643" targetFramework="net45" />
<package id="JetBrains.Platform.Tests.Framework" version="107.0.20161214.153643" targetFramework="net45" />
<package id="JetBrains.Psi.Features.Core" version="107.0.20161215.131222" targetFramework="net45" />
<package id="JetBrains.Psi.Features.src" version="107.0.20161215.131222" targetFramework="net45" />
<package id="JetBrains.Psi.Features.Tasks" version="107.0.20161215.131222" targetFramework="net45" />
<package id="JetBrains.Psi.Features.test.Framework" version="107.0.20161215.131222" targetFramework="net45" />
<package id="JetBrains.Psi.Features.UnitTesting" version="107.0.20161215.131222" targetFramework="net45" />
<package id="JetBrains.ReSharper.SDK" version="2016.3.20161215.134837" targetFramework="net45" developmentDependency="true" />
<package id="JetBrains.ReSharper.SDK.Internal" version="107.0.20161215.134837" targetFramework="net45" />
<package id="Microsoft.Owin" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.FileSystems" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Host.HttpListener" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.Hosting" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Owin.StaticFiles" version="3.0.1" targetFramework="net45" />
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net45" />
<package id="Mono.Cecil" version="0.9.6.1" targetFramework="net45" />
<package id="Mono.Debugger.Soft" version="1.0.20161020.46" targetFramework="net45" />
<package id="Mono.Debugging" version="1.0.20161020.46" targetFramework="net45" />
<package id="Mono.Debugging.Soft" version="1.0.20161020.46" targetFramework="net45" />
<package id="Mono.Debugging.Win32" version="1.0.20161020.46" targetFramework="net45" />
<package id="Mono.VSCodeDebugging" version="1.0.20161019.44" targetFramework="net45" />
<package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
<package id="NUnit" version="2.6.4" targetFramework="net45" />
<package id="NUnit.ReSharperRunner2" version="2.6.408" targetFramework="net45" />
<package id="NUnit.ReSharperRunner3" version="3.0.12" targetFramework="net45" />
<package id="NVelocity" version="1.0.3" targetFramework="net45" />
<package id="Owin" version="1.0" targetFramework="net45" />
<package id="sharpcompress" version="0.11.6" targetFramework="net45" />
<package id="SharpZipLib.JetBrains.Stripped" version="0.87.20160802.0" targetFramework="net45" />
<package id="Sprache.JetBrains" version="2.0.0.44" targetFramework="net45" />
<package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net45" />
<package id="Wave" version="7.0.0.0" targetFramework="net45" />
<package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net45" />
<package id="xmlrpcnet" version="2.5.0" targetFramework="net45" />
<package id="xunit.abstractions.JetBrains" version="2.0.0" targetFramework="net45" />
<package id="xunit.JetBrains" version="1.9.2" targetFramework="net45" />
<package id="xunit.runner.utility.JetBrains" version="2.2.0" targetFramework="net45" />
</packages>
Loading

0 comments on commit ecb551a

Please sign in to comment.