Skip to content

Commit 7c947e6

Browse files
citizenmattcitizenmatt
committed
Add initial support for 2016.3 wave07
1 parent 33a51ce commit 7c947e6

File tree

8 files changed

+1001
-3
lines changed

8 files changed

+1001
-3
lines changed

‎install/resharper-angularjs.wave07.nuspec‎

Lines changed: 58 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,58 @@
1+
<?xml version="1.0"?>
2+
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
3+
<metadata>
4+
<id>JetBrains.AngularJS</id>
5+
<title>AngularJS</title>
6+
<version>1.6.3-rider1</version>
7+
<authors>JetBrains</authors>
8+
<owners>JetBrains</owners>
9+
<requireLicenseAcceptance>false</requireLicenseAcceptance>
10+
<projectUrl>https://github.com/JetBrains/resharper-angularjs</projectUrl>
11+
<licenseUrl>https://raw.github.com/JetBrains/resharper-angularjs/master/license.txt</licenseUrl>
12+
<iconUrl>https://raw.github.com/JetBrains/resharper-angularjs/master/icon.png</iconUrl>
13+
<description>Code completion and live templates for AngularJS</description>
14+
<releaseNotes>
15+
&#8226; Updated to 2016.3
16+
17+
From 1.6.2:
18+
&#8226; Address performance issue with many directives.
19+
20+
From 1.6.1:
21+
&#8226; Updated to ReSharper 2016.2
22+
&#8226; Initial 1.6.0 release was incorrect, re-compiled and re-released as 1.6.1
23+
24+
From 1.5.1:
25+
&#8226; Fixed exceptions in ReSharper 2016.1.2
26+
&#8226; Fixed warning if directive is declared in code and JSDoc
27+
28+
From 1.5.0:
29+
&#8226; Support for ReSharper 2016.1
30+
&#8226; Addressing performance issues while typing (#45)
31+
32+
From 1.4.1:
33+
&#8226; Support for ReSharper 10 (#39)
34+
&#8226; Fixed multiple directives in JSX files
35+
36+
From 1.3.1:
37+
&#8226; Support for ReSharper 9.2 (#33)
38+
&#8226; HTML elements and attributes dynamically parsed from ngDoc comments (#6, #30, #32)
39+
&#8226; Improve code completion for injected services (#7)
40+
41+
From 1.2.2:
42+
&#8226; Tweaked sort order to put ng- items above data-ng-
43+
&#8226; Added angular icons to the code completion items
44+
</releaseNotes>
45+
<dependencies>
46+
<dependency id="Wave" version="[7.0]" />
47+
</dependencies>
48+
<tags>resharper angular angularjs javascript js typescript</tags>
49+
</metadata>
50+
<files>
51+
<file src="..\src\resharper-angularjs\bin\Release.wave07\JetBrains.ReSharper.Plugins.AngularJS.dll"
52+
target="dotFiles\" />
53+
54+
<!-- Templates -->
55+
<file src="..\src\resharper-angularjs\bin\Release.wave07\templates.dotSettings"
56+
target="dotFiles\Extensions\JetBrains.AngularJS\settings\" />
57+
</files>
58+
</package>

‎src/resharper-angularjs.sln‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.31101.0
3+
# Visual Studio 14
4+
VisualStudioVersion = 14.0.25420.1
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "resharper-angularjs", "resharper-angularjs\resharper-angularjs.csproj", "{B66C17A3-9499-4AD6-93CE-DC8B2823BEF2}"
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests", "..\test\src\test.resharper-angularjs\tests.csproj", "{8E0BE7C0-CB94-4993-94F3-A91961F8A809}"
99
EndProject
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "resharper-angularjs.wave07", "resharper-angularjs\resharper-angularjs.wave07.csproj", "{F50A2291-6669-4B1B-AF18-A63FDE7F9649}"
11+
EndProject
12+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "tests.wave07", "..\test\src\test.resharper-angularjs\tests.wave07.csproj", "{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}"
13+
EndProject
1014
Global
1115
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1216
Debug|Any CPU = Debug|Any CPU
@@ -21,6 +25,14 @@ Global
2125
{8E0BE7C0-CB94-4993-94F3-A91961F8A809}.Debug|Any CPU.Build.0 = Debug|Any CPU
2226
{8E0BE7C0-CB94-4993-94F3-A91961F8A809}.Release|Any CPU.ActiveCfg = Release|Any CPU
2327
{8E0BE7C0-CB94-4993-94F3-A91961F8A809}.Release|Any CPU.Build.0 = Release|Any CPU
28+
{F50A2291-6669-4B1B-AF18-A63FDE7F9649}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
29+
{F50A2291-6669-4B1B-AF18-A63FDE7F9649}.Debug|Any CPU.Build.0 = Debug|Any CPU
30+
{F50A2291-6669-4B1B-AF18-A63FDE7F9649}.Release|Any CPU.ActiveCfg = Release|Any CPU
31+
{F50A2291-6669-4B1B-AF18-A63FDE7F9649}.Release|Any CPU.Build.0 = Release|Any CPU
32+
{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
33+
{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
34+
{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
35+
{BFB236A2-9D68-403D-8CE2-9B4C69B067FA}.Release|Any CPU.Build.0 = Release|Any CPU
2436
EndGlobalSection
2537
GlobalSection(SolutionProperties) = preSolution
2638
HideSolutionNode = FALSE

‎src/resharper-angularjs/Feature/Services/Caches/JsDocFileProcessor.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,11 @@ public void ProcessJsDocFile(IJsDocFile jsDocFile)
5757
if (!string.IsNullOrEmpty(name))
5858
name = name.Substring(name.IndexOf(':') + 1);
5959

60+
#if WAVE07
61+
var nameOffset = nameTag.GetDocumentStartOffset().Offset;
62+
#else
6063
var nameOffset = nameTag.GetDocumentStartOffset().TextRange.StartOffset;
64+
#endif
6165

6266
var ngdocValue = ngdocTag.DescriptionText;
6367
if (!string.IsNullOrEmpty(name) && !string.IsNullOrEmpty(ngdocValue))

‎src/resharper-angularjs/Properties/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,5 +29,5 @@
2929
[assembly: AssemblyCulture("")]
3030

3131
// Use a static version value so that ReSharper Build won't rebuild referencing assemblies
32-
[assembly: AssemblyVersion("1.6.2.0")]
32+
[assembly: AssemblyVersion("1.6.3.0")]
3333

‎src/resharper-angularjs/packages.resharper-angularjs.wave07.config‎

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="Antlr2.Runtime" version="2.7.7.02" targetFramework="net40" />
4+
<package id="Antlr2.Tools" version="2.7.6.4" targetFramework="net40" />
5+
<package id="AsyncBridge.JetBrains" version="0.1.1.0" targetFramework="net40" />
6+
<package id="AsyncIO" version="0.1.18.0" targetFramework="net40" />
7+
<package id="DotNetZip.Reduced" version="1.9.1.8" targetFramework="net40" />
8+
<package id="ICSharpCode.NRefactory" version="5.5.1" targetFramework="net40" />
9+
<package id="JetBrains.Annotations" version="10.2.1" targetFramework="net40" />
10+
<package id="JetBrains.Build.Platform.Tasks.ThemedIconsPacker" version="2.0.20151217.1" targetFramework="net40" developmentDependency="true" />
11+
<package id="JetBrains.ExternalAnnotations" version="10.2.2" targetFramework="net40" />
12+
<package id="JetBrains.Mono.Posix" version="0.1" targetFramework="net40" />
13+
<package id="JetBrains.MSBuild.Xplat.Engine" version="20161013.1.0" targetFramework="net40" />
14+
<package id="JetBrains.Platform.Core.Ide" version="107.0.20161020.73542-eap5" targetFramework="net40" />
15+
<package id="JetBrains.Platform.Core.Shell" version="107.0.20161020.73224-eap5" targetFramework="net40" />
16+
<package id="JetBrains.Platform.Core.Text" version="107.0.20161020.73542-eap5" targetFramework="net40" />
17+
<package id="JetBrains.Platform.Installer" version="107.0.20161020.73542-eap5" targetFramework="net40" />
18+
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Framework" version="107.0.20161020.73542-eap5" targetFramework="net40" />
19+
<package id="JetBrains.Platform.Interop.dotMemoryUnit.Interop" version="107.0.20161020.73542-eap5" targetFramework="net40" />
20+
<package id="JetBrains.Platform.Lib.DevExpress" version="2.0.20150224.0" targetFramework="net40" />
21+
<package id="JetBrains.Platform.Lib.Microsoft.Deployment.Compression.Cab" version="2.0.20140304.0" targetFramework="net40" />
22+
<package id="JetBrains.Platform.Lib.Microsoft.Deployment.WindowsInstaller" version="2.0.20140821.0" targetFramework="net40" />
23+
<package id="JetBrains.Platform.Lib.System.Windows.Interactivity" version="2.0.20140318.0" targetFramework="net40" />
24+
<package id="JetBrains.Platform.Lib.VisualStudio.AnyVs.ShellInterop.PrivateBuild" version="2.0.20140304.0" targetFramework="net40" />
25+
<package id="JetBrains.Platform.Lib.WpfContrib" version="2.0.20150225.0" targetFramework="net40" />
26+
<package id="JetBrains.Platform.RdProtocol" version="107.0.20161020.73542-eap5" targetFramework="net40" />
27+
<package id="JetBrains.Platform.Symbols" version="107.0.20161020.73542-eap5" targetFramework="net40" />
28+
<package id="JetBrains.Platform.Tests.Framework" version="107.0.20161020.73542-eap5" targetFramework="net40" />
29+
<package id="JetBrains.Platform.VisualStudio" version="107.0.20161020.73542-eap5" targetFramework="net40" />
30+
<package id="JetBrains.Psi.Features.Core" version="107.0.20161020.73852-eap5" targetFramework="net40" />
31+
<package id="JetBrains.Psi.Features.Cpp.Src" version="107.0.20161020.74455-eap5" targetFramework="net40" />
32+
<package id="JetBrains.Psi.Features.SolutionBuilder" version="107.0.20161020.73852-eap5" targetFramework="net40" />
33+
<package id="JetBrains.Psi.Features.src" version="107.0.20161020.73852-eap5" targetFramework="net40" />
34+
<package id="JetBrains.Psi.Features.Tasks" version="107.0.20161020.73852-eap5" targetFramework="net40" />
35+
<package id="JetBrains.Psi.Features.test.Framework" version="107.0.20161020.73852-eap5" targetFramework="net40" />
36+
<package id="JetBrains.Psi.Features.UnitTesting" version="107.0.20161020.73852-eap5" targetFramework="net40" />
37+
<package id="JetBrains.Psi.Features.VisualStudio" version="107.0.20161020.73852-eap5" targetFramework="net40" />
38+
<package id="JetBrains.ReSharper.SDK" version="2016.3.20161020.81315-eap5" targetFramework="net40" developmentDependency="true" />
39+
<package id="JetBrains.ReSharper.SDK.Internal" version="107.0.20161020.81315-eap5" targetFramework="net40" />
40+
<package id="JetBrains.WinDbg.SymStore" version="10.0.10586.20151201" targetFramework="net40" developmentDependency="true" />
41+
<package id="Microsoft.VC100.CRT.JetBrains" version="10.00.40219.2" targetFramework="net40" />
42+
<package id="Microsoft.VC120.CRT.JetBrains" version="12.0.21005.2" targetFramework="net40" />
43+
<package id="Microsoft.Web.Xdt" version="2.1.1" targetFramework="net40" />
44+
<package id="Mono.Cecil" version="0.9.6.1" targetFramework="net40" />
45+
<package id="Mono.Debugger.Soft" version="1.0.20161017.36" targetFramework="net40" />
46+
<package id="Mono.Debugging" version="1.0.20161017.36" targetFramework="net40" />
47+
<package id="Mono.Debugging.Soft" version="1.0.20161017.36" targetFramework="net40" />
48+
<package id="Mono.Debugging.Win32" version="1.0.20161017.36" targetFramework="net40" />
49+
<package id="NetMQ" version="3.3.3.1" targetFramework="net40" />
50+
<package id="Newtonsoft35.Json" version="7.0.1" targetFramework="net40" />
51+
<package id="NuGet.Core" version="2.13.0-rc1-final" targetFramework="net40" />
52+
<package id="NuGet.Core.Ultimate" version="3.5.0-rc1-final-jb1" targetFramework="net40" />
53+
<package id="NUnit" version="2.6.4" targetFramework="net40" />
54+
<package id="NUnit.ReSharperRunner2" version="2.6.408" targetFramework="net40" />
55+
<package id="NUnit.ReSharperRunner3" version="3.0.12" targetFramework="net40" />
56+
<package id="NVelocity" version="1.0.3" targetFramework="net40" />
57+
<package id="sharpcompress" version="0.11.6" targetFramework="net40" />
58+
<package id="SharpZipLib.JetBrains.Stripped" version="0.87.20160802.0" targetFramework="net40" />
59+
<package id="Sprache.JetBrains" version="2.0.0.44" targetFramework="net40" />
60+
<package id="Vestris.ResourceLib.JetBrains" version="1.4.20150303.0" targetFramework="net40" />
61+
<package id="Wave" version="7.0.0.0-eap5" targetFramework="net40" />
62+
<package id="Windows7APICodePack.JetBrains.Stripped" version="1.1.20150225.0" targetFramework="net40" />
63+
<package id="xmlrpcnet" version="2.5.0" targetFramework="net40" />
64+
<package id="xunit.abstractions.JetBrains" version="2.0.0" targetFramework="net40" />
65+
<package id="xunit.JetBrains" version="1.9.2" targetFramework="net40" />
66+
<package id="xunit.runner.utility.JetBrains" version="2.2.0" targetFramework="net40" />
67+
</packages>

0 commit comments

Comments
 (0)