Skip to content

Commit 8233ccf

Browse files
author
Sébastien Geiser
committed
ReAdd MethodDecorator
1 parent 8e40af1 commit 8233ccf

19 files changed

+58
-33
lines changed

‎CSharpRegexTools4Npp/BNpp.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
using System.IO;
55
using System.Text;
66

7+
78
namespace CSharpRegexTools4Npp
89
{
910
public class BNpp

‎CSharpRegexTools4Npp/CSharpRegexTools4Npp.csproj

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\MethodDecorator.Fody.1.0.2\build\MethodDecorator.Fody.props" Condition="Exists('..\packages\MethodDecorator.Fody.1.0.2\build\MethodDecorator.Fody.props')" />
34
<Import Project="..\packages\Costura.Fody.3.3.2\build\Costura.Fody.props" Condition="Exists('..\packages\Costura.Fody.3.3.2\build\Costura.Fody.props')" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -68,6 +69,9 @@
6869
<Reference Include="Costura, Version=3.3.2.0, Culture=neutral, PublicKeyToken=9919ef960d84173d, processorArchitecture=MSIL">
6970
<HintPath>..\packages\Costura.Fody.3.3.2\lib\net40\Costura.dll</HintPath>
7071
</Reference>
72+
<Reference Include="MethodDecorator, Version=1.0.2.0, Culture=neutral, PublicKeyToken=0de10386fb6c39dd, processorArchitecture=MSIL">
73+
<HintPath>..\packages\MethodDecorator.Fody.1.0.2\lib\net452\MethodDecorator.dll</HintPath>
74+
</Reference>
7175
<Reference Include="Microsoft.CSharp" />
7276
<Reference Include="PresentationCore" />
7377
<Reference Include="PresentationFramework" />
@@ -109,6 +113,7 @@
109113
<DesignTime>True</DesignTime>
110114
<DependentUpon>Resources.resx</DependentUpon>
111115
</Compile>
116+
<Compile Include="Utils\Interceptor.cs" />
112117
</ItemGroup>
113118
<ItemGroup>
114119
<EmbeddedResource Include="Resources.resx">
@@ -148,6 +153,7 @@
148153
</PropertyGroup>
149154
<Error Condition="!Exists('..\packages\Fody.4.0.2\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.4.0.2\build\Fody.targets'))" />
150155
<Error Condition="!Exists('..\packages\Costura.Fody.3.3.2\build\Costura.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Costura.Fody.3.3.2\build\Costura.Fody.props'))" />
156+
<Error Condition="!Exists('..\packages\MethodDecorator.Fody.1.0.2\build\MethodDecorator.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\MethodDecorator.Fody.1.0.2\build\MethodDecorator.Fody.props'))" />
151157
</Target>
152158
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
153159
Other similar extension points exist, see Microsoft.Common.targets.

‎CSharpRegexTools4Npp/FodyWeavers.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
3+
<MethodDecorator />
34
<Costura />
45
</Weavers>

‎CSharpRegexTools4Npp/FodyWeavers.xsd

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
<xs:element name="Weavers">
55
<xs:complexType>
66
<xs:all>
7+
<xs:element name="MethodDecorator" minOccurs="0" maxOccurs="1" type="xs:anyType" />
78
<xs:element name="Costura" minOccurs="0" maxOccurs="1">
89
<xs:complexType>
910
<xs:all>

‎CSharpRegexTools4Npp/PluginInfrastructure/ClikeStringArray.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
namespace CSharpRegexTools4Npp.PluginInfrastructure
77
{
8-
98
public class ClikeStringArray : IDisposable
109
{
1110
IntPtr _nativeArray;

‎CSharpRegexTools4Npp/PluginInfrastructure/DllExport/DllExportAttribute.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
namespace NppPlugin.DllExport
66
{
77
[AttributeUsage(AttributeTargets.Method, AllowMultiple = false)]
8-
partial class DllExportAttribute : Attribute
8+
public partial class DllExportAttribute : Attribute
99
{
1010
public DllExportAttribute()
1111
{

‎CSharpRegexTools4Npp/PluginInfrastructure/GatewayDomain.cs

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ namespace CSharpRegexTools4Npp.PluginInfrastructure
1111
/// If you set all intensities to 255, the colour is white. If you set all intensities to 0, the colour is black.
1212
/// When you set a colour, you are making a request. What you will get depends on the capabilities of the system and the current screen mode.
1313
/// </summary>
14-
1514
public class Colour
1615
{
1716
public readonly int Red, Green, Blue;
@@ -62,7 +61,6 @@ public int Value
6261
/// If you use messages, there is nothing to stop you setting a position that is in the middle of a CRLF pair, or in the middle of a 2 byte character.
6362
/// However, keyboard commands will not move the caret into such positions.
6463
/// </summary>
65-
6664
public class Position : IEquatable<Position>
6765
{
6866
private readonly int pos;
@@ -129,7 +127,7 @@ public static Position Max(Position a, Position b)
129127

130128
public override string ToString()
131129
{
132-
return "Postion: " + pos;
130+
return "Position: " + pos;
133131
}
134132

135133
public bool Equals(Position other)
@@ -149,7 +147,7 @@ public override bool Equals(object obj)
149147

150148
public override int GetHashCode()
151149
{
152-
return (int)pos;
150+
return (int) pos;
153151
}
154152
}
155153

@@ -164,7 +162,6 @@ public override int GetHashCode()
164162
/// On OS X, the Command key is mapped to SCMOD_CTRL and the Control key to SCMOD_META.SCMOD_SUPER is only available on GTK+ which is commonly the Windows key.
165163
/// If you are building a table, you might want to use SCMOD_NORM, which has the value 0, to mean no modifiers.
166164
/// </summary>
167-
168165
public class KeyModifier
169166
{
170167
private readonly int value;
@@ -197,7 +194,6 @@ public struct CharacterRange
197194
public int cpMax;
198195
}
199196

200-
201197
public class Cells
202198
{
203199
char[] charactersAndStyles;
@@ -210,7 +206,6 @@ public Cells(char[] charactersAndStyles)
210206
public char[] Value { get { return charactersAndStyles; } }
211207
}
212208

213-
214209
public class TextRange : IDisposable
215210
{
216211
Sci_TextRange _sciTextRange;

‎CSharpRegexTools4Npp/PluginInfrastructure/Msgs_h.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
namespace CSharpRegexTools4Npp.PluginInfrastructure
1111
{
12-
class Constants
12+
public class Constants
1313
{
1414
public const int WM_USER = 0x400;
1515
public const int NPPMSG = WM_USER + 1000;

‎CSharpRegexTools4Npp/PluginInfrastructure/NotepadPPGateway.cs

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// NPP plugin platform for .Net v0.94.00 by Kasper B. Graversen etc.
22
using System;
33
using System.Text;
4-
using NppPluginNET.PluginInfrastructure;
54

65
namespace CSharpRegexTools4Npp.PluginInfrastructure
76
{
@@ -14,12 +13,11 @@ public interface INotepadPPGateway
1413
void SetCurrentLanguage(LangType language);
1514
}
1615

17-
/// <summary>
18-
/// This class holds helpers for sending messages defined in the Msgs_h.cs file. It is at the moment
19-
/// incomplete. Please help fill in the blanks.
20-
/// </summary>
21-
22-
public class NotepadPPGateway : INotepadPPGateway
16+
/// <summary>
17+
/// This class holds helpers for sending messages defined in the Msgs_h.cs file. It is at the moment
18+
/// incomplete. Please help fill in the blanks.
19+
/// </summary>
20+
public class NotepadPPGateway : INotepadPPGateway
2321
{
2422
private const int Unused = 0;
2523

@@ -54,12 +52,11 @@ public void SetCurrentLanguage(LangType language)
5452
}
5553
}
5654

57-
/// <summary>
58-
/// This class holds helpers for sending messages defined in the Resource_h.cs file. It is at the moment
59-
/// incomplete. Please help fill in the blanks.
60-
/// </summary>
61-
62-
public class NppResource
55+
/// <summary>
56+
/// This class holds helpers for sending messages defined in the Resource_h.cs file. It is at the moment
57+
/// incomplete. Please help fill in the blanks.
58+
/// </summary>
59+
public class NppResource
6360
{
6461
private const int Unused = 0;
6562

‎CSharpRegexTools4Npp/PluginInfrastructure/NppPluginNETBase.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33

44
namespace CSharpRegexTools4Npp.PluginInfrastructure
55
{
6-
76
public class PluginBase
87
{
98
internal static NppData nppData;

0 commit comments

Comments
 (0)