Skip to content

Support R# 2020.2 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
drauch wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Support R# 2020.2 #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
1745592
Add support for R#/Rider 2020.2
drauch Nov 24, 2020
f5f5d27
Fix MSBuildPath for CI server.
drauch Nov 27, 2020
fcc821e
Merge remote-tracking branch 'original/master' into feature/support-r…
drauch Nov 27, 2020
b4b6bd1
Fix MSBuild location.
drauch Nov 27, 2020
34d9f5b
Submodule Shared updated
drauch Nov 27, 2020
c1289fa
Fix DependencyVer.
drauch Nov 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ts_ImplicitNullability/buildTypes/OpenSourceProjects_ImplicitNullability_BuildVersion.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<option name="buildNumberPattern" value="%Version%.%build.counter%" />
</options>
<parameters>
<param name="Version" value="4.10.0" />
<param name="Version" value="4.11.0" />
</parameters>
<build-runners />
<vcs-settings />
Expand Down
8 changes: 4 additions & 4 deletions Build/Build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@ trap { $error[0] | Format-List -Force; $host.SetShouldExit(1) }

$BuildOutputPath = "Build\Output"
$SolutionFilePath = "ImplicitNullability.sln"
$MSBuildPath = (Get-ChildItem "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2017\*\MSBuild\15.0\Bin\MSBuild.exe").FullName
$MSBuildPath = (Get-ChildItem "${env:ProgramFiles(x86)}\Microsoft Visual Studio\2019\*\MSBuild\Current\Bin\MSBuild.exe").FullName
$MSBuildAdditionalArgs = "/nowarn:MSB3277"
$NUnitAdditionalArgs = "--x86 --labels=All --agents=1"
$NUnitTestAssemblyPaths = @(
"Src\ImplicitNullability.Plugin.Tests\bin\RD20201\$Configuration\ImplicitNullability.Plugin.Tests.RD20201.dll"
"Src\ImplicitNullability.Plugin.Tests\bin\RS20201\$Configuration\ImplicitNullability.Plugin.Tests.RS20201.dll"
"Src\ImplicitNullability.Plugin.Tests\bin\RD20202\$Configuration\ImplicitNullability.Plugin.Tests.RD20202.dll"
"Src\ImplicitNullability.Plugin.Tests\bin\RS20202\$Configuration\ImplicitNullability.Plugin.Tests.RS20202.dll"
"Src\ImplicitNullability.Samples.Consumer\bin\OfInternalCodeWithIN\$Configuration\ImplicitNullability.Samples.Consumer.OfInternalCodeWithIN.dll"
)
$NUnitFrameworkVersion = "net-4.5"
$TestCoverageFilter = "+[ImplicitNullability*]* -[ImplicitNullability*]ReSharperExtensionsShared.* -[ImplicitNullability.Samples.CodeWithIN.*]* -[ImplicitNullability.Samples.CodeWithoutIN.External]*"
$NuspecPath = "Src\ImplicitNullability.Plugin\ImplicitNullability.nuspec"
$NugetPackProperties = @(
"Version=$(CalcNuGetPackageVersion 20201);Configuration=$Configuration;DependencyVer=[201.0];BinDirInclude=bin\RS20201"
"Version=$(CalcNuGetPackageVersion 20202);Configuration=$Configuration;DependencyVer=[202.0];BinDirInclude=bin\RS20202"
)
$RiderPluginProject = "Src\RiderPlugin"
$NugetPushServer = "https://www.myget.org/F/ulrichb/api/v2/package"
Expand Down
4 changes: 4 additions & 0 deletions History.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
### 4.11.0 ###
- (!) End-of-life note: Please switch to C# 8 Nullable Reference Types
- ReSharper and Rider 2020.2 support

### 4.10.0 ###
- (!) End-of-life note: Please switch to C# 8 Nullable Reference Types
- ReSharper and Rider 2020.1 support
Expand Down
10 changes: 5 additions & 5 deletions ImplicitNullability.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,17 +26,17 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImplicitNullability.Samples
{C98DF2CD-3BB5-4213-9D90-08241ED5B74F} = {C98DF2CD-3BB5-4213-9D90-08241ED5B74F}
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.VsFormatDefinitions.RS20201", "Src\ImplicitNullability.Plugin.VsFormatDefinitions\ImplicitNullability.Plugin.VsFormatDefinitions.RS20201.csproj", "{69D96DC8-E1A0-4412-AD54-BAEC0B43520E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.VsFormatDefinitions.RS20202", "Src\ImplicitNullability.Plugin.VsFormatDefinitions\ImplicitNullability.Plugin.VsFormatDefinitions.RS20202.csproj", "{69D96DC8-E1A0-4412-AD54-BAEC0B43520E}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.RS20201", "Src\ImplicitNullability.Plugin\ImplicitNullability.Plugin.RS20201.csproj", "{2F246B16-414A-4FDF-9DE2-3EC8E51D1B9A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.RS20202", "Src\ImplicitNullability.Plugin\ImplicitNullability.Plugin.RS20202.csproj", "{2F246B16-414A-4FDF-9DE2-3EC8E51D1B9A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.Tests.RS20201", "Src\ImplicitNullability.Plugin.Tests\ImplicitNullability.Plugin.Tests.RS20201.csproj", "{1C93B659-62A2-4539-815D-D20BABB47451}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.Tests.RS20202", "Src\ImplicitNullability.Plugin.Tests\ImplicitNullability.Plugin.Tests.RS20202.csproj", "{1C93B659-62A2-4539-815D-D20BABB47451}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImplicitNullability.Samples.CodeWithIN.Special", "Src\ImplicitNullability.Samples.CodeWithIN.Special\ImplicitNullability.Samples.CodeWithIN.Special.csproj", "{4979B806-EB66-4C3F-8BB0-7AF284AEB0BD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.RD20201", "Src\ImplicitNullability.Plugin\ImplicitNullability.Plugin.RD20201.csproj", "{4ECAB56A-44C9-4A46-B401-FBD782634AA0}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.RD20202", "Src\ImplicitNullability.Plugin\ImplicitNullability.Plugin.RD20202.csproj", "{4ECAB56A-44C9-4A46-B401-FBD782634AA0}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.Tests.RD20201", "Src\ImplicitNullability.Plugin.Tests\ImplicitNullability.Plugin.Tests.RD20201.csproj", "{2E9FE56E-2507-42FC-8146-2F4F9BA4397D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ImplicitNullability.Plugin.Tests.RD20202", "Src\ImplicitNullability.Plugin.Tests\ImplicitNullability.Plugin.Tests.RD20202.csproj", "{2E9FE56E-2507-42FC-8146-2F4F9BA4397D}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
:warning: **End-of-life note:** C# 8+ (VS 2019+) supports [_nullable reference types_](https://docs.microsoft.com/en-us/dotnet/csharp/tutorials/nullable-reference-types) which [supersedes](#c-nullable-reference-types) - and perfectly aligns with - _Implicit Nullability_. Therefore ReSharper/Rider 2020.1 is the last version supported by _Implicit Nullability_.
:warning: **End-of-life note:** C# 8+ (VS 2019+) supports [_nullable reference types_](https://docs.microsoft.com/en-us/dotnet/csharp/tutorials/nullable-reference-types) which [supersedes](#c-nullable-reference-types) - and perfectly aligns with - _Implicit Nullability_. Therefore ReSharper/Rider 2020.2 is the last version supported by _Implicit Nullability_.

## Implicit Nullability ReSharper Extension

Expand Down
2 changes: 1 addition & 1 deletion Shared
Open in desktop
Submodule Shared updated 1 files
+21 −4 Build/BuildFunctions.ps1
2 changes: 1 addition & 1 deletion ...itNullability.Plugin.Tests.RD20201.csproj → ...itNullability.Plugin.Tests.RD20202.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Rider.SDK.Tests" Version="2020.1.*" />
<PackageReference Include="JetBrains.Rider.SDK.Tests" Version="2020.2.*" />
<PackageReference Include="FakeItEasy" Version="4.*" />
<PackageReference Include="ncalc" Version="1.3.*" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...itNullability.Plugin.Tests.RS20201.csproj → ...itNullability.Plugin.Tests.RS20202.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2020.1.*" />
<PackageReference Include="JetBrains.ReSharper.SDK.Tests" Version="2020.2.*" />
<PackageReference Include="FakeItEasy" Version="4.*" />
<PackageReference Include="ncalc" Version="1.3.*" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ty.Plugin.Tests/UnitTests/AnnotationRedundancyInHierarchyWarningFilteringDecoratorTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ public void ConsumeHighlighting_WithSomeHighlighting_ShouldPassCall()

_sut.ConsumeHighlighting(highlightingInfo);

A_.CallTo(() => _decorated.ConsumeHighlighting(highlightingInfo)).MustHaveHappened();
A_.CallTo(() => _decorated.ConsumeHighlighting(highlightingInfo, null, null)).MustHaveHappened();
}

[Test]
Expand Down
2 changes: 1 addition & 1 deletion ...Plugin.VsFormatDefinitions.RS20201.csproj → ...Plugin.VsFormatDefinitions.RS20202.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JetBrains.ReSharper.SDK" Version="2020.1.*" />
<PackageReference Include="JetBrains.ReSharper.SDK" Version="2020.2.*" />
<PackageReference Include="VSSDK.Text.10" Version="10.*" />
</ItemGroup>

Expand Down
3 changes: 2 additions & 1 deletion Src/ImplicitNullability.Plugin/AnnotationRedundancyInHierarchyWarningFilteringDecorator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
using System.Collections.Generic;
using JetBrains.DocumentModel;
using JetBrains.ReSharper.Daemon.CSharp.Errors;
using JetBrains.ReSharper.Feature.Services.Daemon;

Expand All @@ -13,7 +14,7 @@ public AnnotationRedundancyInHierarchyWarningFilteringDecorator(IHighlightingCon
_decorated = decorated;
}

public void ConsumeHighlighting(HighlightingInfo highlightingInfo)
public void ConsumeHighlighting(HighlightingInfo highlightingInfo, DocumentRange[] secondaryDocumentRanges = null, string secondaryAttributeId = null)
{
if (!(highlightingInfo.Highlighting is AnnotationRedundancyInHierarchyWarning))
{
Expand Down
19 changes: 9 additions & 10 deletions ...ImplicitNullability.Plugin/Highlighting/ImplicitNotNullConflictInHierarchyHighlighting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
using ImplicitNullability.Plugin.Highlighting;
using JetBrains.ReSharper.Feature.Services.Daemon;
using JetBrains.ReSharper.Feature.Services.Daemon;
using JetBrains.ReSharper.Psi.CSharp;
using JetBrains.ReSharper.Psi.Tree;

[assembly: RegisterConfigurableSeverity(
ImplicitNotNullConflictInHierarchyHighlighting.SeverityId,
CompoundItemName: null,
Group: HighlightingGroupIds.CodeSmell,
Title: ImplicitNotNullConflictInHierarchyHighlighting.Message,
Description: ImplicitNotNullConflictInHierarchyHighlighting.Description,
DefaultSeverity: Severity.WARNING)]

namespace ImplicitNullability.Plugin.Highlighting
{
[RegisterConfigurableSeverity(
SeverityId,
CompoundItemName: null,
Group: HighlightingGroupIds.CodeSmell,
Title: Message,
Description: Description,
DefaultSeverity: Severity.WARNING)]

[ConfigurableSeverityHighlighting(
SeverityId,
CSharpLanguage.Name,
Expand Down
19 changes: 9 additions & 10 deletions ...lability.Plugin/Highlighting/ImplicitNotNullElementCannotOverrideCanBeNullHighlighting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,17 @@
using ImplicitNullability.Plugin.Highlighting;
using JetBrains.ReSharper.Feature.Services.Daemon;
using JetBrains.ReSharper.Feature.Services.Daemon;
using JetBrains.ReSharper.Psi.CSharp;
using JetBrains.ReSharper.Psi.Tree;

[assembly: RegisterConfigurableSeverity(
ImplicitNotNullElementCannotOverrideCanBeNullHighlighting.SeverityId,
CompoundItemName: null,
Group: HighlightingGroupIds.CodeSmell,
Title: ImplicitNotNullElementCannotOverrideCanBeNullHighlighting.Message,
Description: ImplicitNotNullElementCannotOverrideCanBeNullHighlighting.Description,
DefaultSeverity: Severity.WARNING)]

namespace ImplicitNullability.Plugin.Highlighting
{
[RegisterConfigurableSeverity(
SeverityId,
CompoundItemName: null,
Group: HighlightingGroupIds.CodeSmell,
Title: Message,
Description: Description,
DefaultSeverity: Severity.WARNING)]

[ConfigurableSeverityHighlighting(
SeverityId,
CSharpLanguage.Name,
Expand Down
20 changes: 9 additions & 11 deletions ...y.Plugin/Highlighting/ImplicitNotNullOverridesUnknownBaseMemberNullabilityHighlighting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
using ImplicitNullability.Plugin.Highlighting;
using JetBrains.ReSharper.Feature.Services.Daemon;
using JetBrains.ReSharper.Feature.Services.Daemon;
using JetBrains.ReSharper.Psi.CSharp;
using JetBrains.ReSharper.Psi.Tree;

[assembly: RegisterConfigurableSeverity(
ImplicitNotNullOverridesUnknownBaseMemberNullabilityHighlighting.SeverityId,
CompoundItemName: null,
Group: HighlightingGroupIds.CodeSmell,
Title: ImplicitNotNullOverridesUnknownBaseMemberNullabilityHighlighting.Message,
Description: ImplicitNotNullOverridesUnknownBaseMemberNullabilityHighlighting.Description,
DefaultSeverity: Severity.WARNING,
AlternativeIDs = "ImplicitNotNullOverridesUnknownExternalMember")]

namespace ImplicitNullability.Plugin.Highlighting
{
[RegisterConfigurableSeverity(
SeverityId,
CompoundItemName: null,
Group: HighlightingGroupIds.CodeSmell,
Title: Message,
Description: Description,
DefaultSeverity: Severity.WARNING,
AlternativeIDs = "ImplicitNotNullOverridesUnknownExternalMember")]
[ConfigurableSeverityHighlighting(
SeverityId,
CSharpLanguage.Name,
Expand Down
20 changes: 9 additions & 11 deletions ...in/Highlighting/ImplicitNotNullResultOverridesUnknownBaseMemberNullabilityHighlighting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,17 @@
using ImplicitNullability.Plugin.Highlighting;
using JetBrains.ReSharper.Feature.Services.Daemon;
using JetBrains.ReSharper.Feature.Services.Daemon;
using JetBrains.ReSharper.Psi.CSharp;
using JetBrains.ReSharper.Psi.Tree;

[assembly: RegisterConfigurableSeverity(
ImplicitNotNullResultOverridesUnknownBaseMemberNullabilityHighlighting.SeverityId,
CompoundItemName: null,
Group: HighlightingGroupIds.CodeSmell,
Title: ImplicitNotNullResultOverridesUnknownBaseMemberNullabilityHighlighting.Message,
Description: ImplicitNotNullResultOverridesUnknownBaseMemberNullabilityHighlighting.Description,
DefaultSeverity: Severity.HINT,
AlternativeIDs = "ImplicitNotNullResultOverridesUnknownExternalMember")]

namespace ImplicitNullability.Plugin.Highlighting
{
[RegisterConfigurableSeverity(
SeverityId,
CompoundItemName: null,
Group: HighlightingGroupIds.CodeSmell,
Title: Message,
Description: Description,
DefaultSeverity: Severity.HINT,
AlternativeIDs = "ImplicitNotNullResultOverridesUnknownExternalMember")]
[ConfigurableSeverityHighlighting(
SeverityId,
CSharpLanguage.Name,
Expand Down
18 changes: 8 additions & 10 deletions Src/ImplicitNullability.Plugin/Highlighting/NotNullOnImplicitCanBeNullHighlighting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,16 @@
using ImplicitNullability.Plugin.Highlighting;
using JetBrains.ReSharper.Feature.Services.Daemon;
using JetBrains.ReSharper.Feature.Services.Daemon;
using JetBrains.ReSharper.Psi.CSharp;
using JetBrains.ReSharper.Psi.Tree;

[assembly: RegisterConfigurableSeverity(
NotNullOnImplicitCanBeNullHighlighting.SeverityId,
CompoundItemName: null,
Group: HighlightingGroupIds.CodeSmell,
Title: NotNullOnImplicitCanBeNullHighlighting.Message,
Description: NotNullOnImplicitCanBeNullHighlighting.Description,
DefaultSeverity: Severity.WARNING)]

namespace ImplicitNullability.Plugin.Highlighting
{
[RegisterConfigurableSeverity(
SeverityId,
CompoundItemName: null,
Group: HighlightingGroupIds.CodeSmell,
Title: Message,
Description: Description,
DefaultSeverity: Severity.WARNING)]
[ConfigurableSeverityHighlighting(
SeverityId,
CSharpLanguage.Name,
Expand Down
2 changes: 1 addition & 1 deletion ...ImplicitNullability.Plugin.RD20201.csproj → ...ImplicitNullability.Plugin.RD20202.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JetBrains.Rider.SDK" Version="2020.1.*" />
<PackageReference Include="JetBrains.Rider.SDK" Version="2020.2.*" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion ...ImplicitNullability.Plugin.RS20201.csproj → ...ImplicitNullability.Plugin.RS20202.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="JetBrains.ReSharper.SDK" Version="2020.1.*" />
<PackageReference Include="JetBrains.ReSharper.SDK" Version="2020.2.*" />
</ItemGroup>

<ItemGroup>
Expand Down
17 changes: 8 additions & 9 deletions Src/ImplicitNullability.Plugin/TypeHighlighting/StaticNullabilityItemTypeHighlighting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
using ImplicitNullability.Plugin.TypeHighlighting;
using JetBrains.ReSharper.Feature.Services.Daemon;
using JetBrains.ReSharper.Psi.CSharp;
using JetBrains.ReSharper.Psi.Tree;
using JetBrains.TextControl.DocumentMarkup;

// For ReSharper/VS's format definition, see NullabilityItemTypeHighlightingClassificationFormatDefinition

[assembly: RegisterHighlighter(
StaticNullabilityItemTypeHighlighting.HighlightingId,
EffectColor = "#FF7CE3",
EffectType = EffectType.DOTTED_UNDERLINE,
Layer = HighlighterLayer.SYNTAX,
VSPriority = VSPriority.IDENTIFIERS)]

namespace ImplicitNullability.Plugin.TypeHighlighting
{
[RegisterHighlighter(
HighlightingId,
EffectColor = "#FF7CE3",
EffectType = EffectType.DOTTED_UNDERLINE,
Layer = HighlighterLayer.SYNTAX,
VSPriority = VSPriority.IDENTIFIERS)]
[StaticSeverityHighlighting(
Severity.INFO,
CSharpLanguage.Name,
typeof(HighlightingGroupIds.CodeSmellStatic),
Languages = CSharpLanguage.Name,
AttributeId = HighlightingId,
ShowToolTipInStatusBar = false,
ToolTipFormatString = Message)]
Expand Down
17 changes: 8 additions & 9 deletions Src/ImplicitNullability.Plugin/TypeHighlighting/StaticNullabilityTypeHighlighting.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
using ImplicitNullability.Plugin.TypeHighlighting;
using JetBrains.ReSharper.Feature.Services.Daemon;
using JetBrains.ReSharper.Psi.CSharp;
using JetBrains.ReSharper.Psi.Tree;
using JetBrains.TextControl.DocumentMarkup;

// For ReSharper/VS's format definition, see NullabilityTypeHighlightingClassificationFormatDefinition

[assembly: RegisterHighlighter(
StaticNullabilityTypeHighlighting.HighlightingId,
EffectColor = "#E53DFF",
EffectType = EffectType.DOTTED_UNDERLINE,
Layer = HighlighterLayer.SYNTAX,
VSPriority = VSPriority.IDENTIFIERS)]

namespace ImplicitNullability.Plugin.TypeHighlighting
{
[RegisterHighlighter(
HighlightingId,
EffectColor = "#E53DFF",
EffectType = EffectType.DOTTED_UNDERLINE,
Layer = HighlighterLayer.SYNTAX,
VSPriority = VSPriority.IDENTIFIERS)]
[StaticSeverityHighlighting(
Severity.INFO,
CSharpLanguage.Name,
typeof(HighlightingGroupIds.CodeSmellStatic),
Languages = CSharpLanguage.Name,
AttributeId = HighlightingId,
ShowToolTipInStatusBar = false,
ToolTipFormatString = Message)]
Expand Down
4 changes: 2 additions & 2 deletions Src/RiderPlugin/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ if (!project.hasProperty('configuration')) ext.configuration = 'Debug'
intellij {
type = 'RD'
// https://www.jetbrains.com/intellij-repository/releases
version = '2020.1.0'
version = '2020.2.0'
downloadSources = false
}

Expand All @@ -25,7 +25,7 @@ compileKotlin {
}

prepareSandbox {
from("$projectDir/../$gradle.resharperPluginProjectName/bin/RD20201/$configuration", {
from("$projectDir/../$gradle.resharperPluginProjectName/bin/RD20202/$configuration", {
into "$intellij.pluginName/dotnet"
include "$gradle.resharperPluginProjectName*"
})
Expand Down