diff --git a/.gitignore b/.gitignore index 64798bf5..98f1d1d1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,39 +1,40 @@ -*/obj/* -*/bin/* -*/Debug/* -*.FileListAbsolute.txt -/3PA/Backup 4 of 3PA.csproj -/3PA/Backup 5 of 3PA.csproj -/3PA/Backup 6 of 3PA.csproj -/3PA/Backup 1 of 3PA.csproj -/3PA/Backup 2 of 3PA.csproj -/3PA/Backup 3 of 3PA.csproj -/3PA/Lib/3pUpdater/3pUpdater/obj -/3PA/Lib/3pUpdater/3pUpdater/bin -/ObjectListView/obj -/ObjectListView/bin -/YamuiDemoApp/obj -/YamuiDemoApp/bin -/YamuiFramework/bin -/YamuiFramework/obj -/3PA/bin -/3PA/obj -/3PA/Lib/ObjectListView/ObjectListView.XML -/.vs/3P/v14 -/3P.sln.DotSettings.user -/3PA/Lib/ObjectListView/ObjectListView.dll -/3PA/Lib/ObjectListView/ObjectListView.pdb -/3PA/Lib/YamuiFolder/YamuiFramework.dll -/3PA/Lib/YamuiFolder/YamuiFramework.pdb -/3PA/3P.csproj.user -/.vs/Supercharger/3P -/.vs/Supercharger/ObjectListView2012 -/.vs/Supercharger/YamuiFramework -/Releases -/.vs/config/applicationhost.config -/3PA/_Resource/Dependencies/YamuiFramework.dll -/.vs/3P/v15 -/.idea -/3PA/*.DotSettings -/*.suo -/packages/DllExport.1.6.0 +*/obj/* +*/bin/* +*/Debug/* +*.FileListAbsolute.txt +/3PA/Backup 4 of 3PA.csproj +/3PA/Backup 5 of 3PA.csproj +/3PA/Backup 6 of 3PA.csproj +/3PA/Backup 1 of 3PA.csproj +/3PA/Backup 2 of 3PA.csproj +/3PA/Backup 3 of 3PA.csproj +/3PA/Lib/3pUpdater/3pUpdater/obj +/3PA/Lib/3pUpdater/3pUpdater/bin +/ObjectListView/obj +/ObjectListView/bin +/YamuiDemoApp/obj +/YamuiDemoApp/bin +/YamuiFramework/bin +/YamuiFramework/obj +/3PA/bin +/3PA/obj +/3PA/Lib/ObjectListView/ObjectListView.XML +/.vs/3P/v14 +/3P.sln.DotSettings.user +/3PA/Lib/ObjectListView/ObjectListView.dll +/3PA/Lib/ObjectListView/ObjectListView.pdb +/3PA/Lib/YamuiFolder/YamuiFramework.dll +/3PA/Lib/YamuiFolder/YamuiFramework.pdb +/3PA/3P.csproj.user +/.vs/Supercharger/3P +/.vs/Supercharger/ObjectListView2012 +/.vs/Supercharger/YamuiFramework +/Releases +/.vs/config/applicationhost.config +/3PA/_Resource/Dependencies/YamuiFramework.dll +/.vs/3P/v15 +/.idea +/3PA/*.DotSettings +/*.suo +/packages/DllExport.1.6.0 +/.vs/** \ No newline at end of file diff --git a/3PA/NppCore/NotificationsPublisher.cs b/3PA/NppCore/NotificationsPublisher.cs index f61c289c..9c413bbd 100644 --- a/3PA/NppCore/NotificationsPublisher.cs +++ b/3PA/NppCore/NotificationsPublisher.cs @@ -150,12 +150,13 @@ public static void OnNppNotification(SCNotification nc) { } // only 1 char appears to be modified - if (nc.length.ToInt32() <= 2) { + var ncLength = nc.length.ToInt32(); + if (ncLength <= 2) { // get the char var bytes = (byte*) nc.text; - var arrbyte = new byte[nc.length.ToInt32()]; + var arrbyte = new byte[ncLength]; int index; - for (index = 0; index < nc.length.ToInt32(); index++) + for (index = 0; index < ncLength; index++) arrbyte[index] = bytes[index]; var c = encoding.GetChars(arrbyte); var cLength = c.Length; diff --git a/3PA/Properties/AssemblyInfo.cs b/3PA/Properties/AssemblyInfo.cs index 277f00d8..81d1a90e 100644 --- a/3PA/Properties/AssemblyInfo.cs +++ b/3PA/Properties/AssemblyInfo.cs @@ -1,58 +1,58 @@ -#region header -// ======================================================================== -// Copyright (c) 2018 - Julien Caillon (julien.caillon@gmail.com) -// This file (AssemblyInfo.cs) is part of 3P. -// -// 3P is a free software: you can redistribute it and/or modify -// it under the terms of the GNU General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// 3P is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with 3P. If not, see . -// ======================================================================== -#endregion -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. - -[assembly: AssemblyTitle("3P - Progress Programmers Pal - Julien Caillon")] -[assembly: AssemblyDescription("Progress Programmers Pal")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("LeCavalierCasta")] -[assembly: AssemblyProduct("3P")] -[assembly: AssemblyCopyright("Copyright (c) 2018 - Julien Caillon - GNU General Public License v3")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. - -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM - -[assembly: Guid("31492674-6fe0-485c-91f0-2e17244588ff")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] - -[assembly: AssemblyVersion("1.8.4.0")] +#region header +// ======================================================================== +// Copyright (c) 2018 - Julien Caillon (julien.caillon@gmail.com) +// This file (AssemblyInfo.cs) is part of 3P. +// +// 3P is a free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// 3P is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with 3P. If not, see . +// ======================================================================== +#endregion +using System.Reflection; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. + +[assembly: AssemblyTitle("3P - Progress Programmers Pal - Julien Caillon")] +[assembly: AssemblyDescription("Progress Programmers Pal")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("LeCavalierCasta")] +[assembly: AssemblyProduct("3P")] +[assembly: AssemblyCopyright("Copyright (c) 2018 - Julien Caillon - GNU General Public License v3")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. + +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM + +[assembly: Guid("31492674-6fe0-485c-91f0-2e17244588ff")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// +// You can specify all the values or you can default the Build and Revision Numbers +// by using the '*' as shown below: +// [assembly: AssemblyVersion("1.0.*")] + +[assembly: AssemblyVersion("1.8.5.0")] //[assembly: AssemblyFileVersion("1.5.3.1")] \ No newline at end of file diff --git a/docs/NEXT_RELEASE_NOTES.md b/docs/NEXT_RELEASE_NOTES.md index 1ef4496c..4eca4376 100644 --- a/docs/NEXT_RELEASE_NOTES.md +++ b/docs/NEXT_RELEASE_NOTES.md @@ -1,31 +1,9 @@ -### Improvements ### - -### Fixed issues ### - -- \#246: Wrong behavior for the auto-completion in multi-carets mode -- \#251: Silent error parsing UserDefineLang.xml -- \#250: Crash during shutdown due to modified collection -- \#249: Admin rights required to update 3P for notepad++ version 7.6.1 to 7.6.2 -- \#252: From notepad++ v7.6.2, autocompletion .xml files were moved to $installdir/autoCompletion -- \#227: Infinite loop on includes calling the same include (huge thanks to simi aka @slegian for his precious help) -- \#206: 3P can now evaluate pre-processed expression in &IF statements and ignore definitions made in false blocks -- &GLOBAL-DEFINE variables defined in includes now correctly appear in the autocompletion -- \#233: Parser error on unbalanced DO / END blocks -- \#254: Parser error for &ANALYZE-RESUME followed by a block name -- \#242: Download datadigger in the custom folder specified in the options (if not aleady installed) - -### Recent changes in notepad++ ### - -Little warning, if you plan to update your notepad++ installation (which you probably should do :p). - -Since v7.6.x, there has been some changes regarding the plugins location: - -- in v7.6.0, plugins were moved from `/plugins/3P.dll` to `/plugins/3P/3P.dll`. -- in v7.6.1, (for non portable installation) the base plugins folder was moved from `%LOCALAPPDATA%` to `%PROGRAMDATA%`. -- in v7.6.3, (for non portable installation) the base plugins folder was moved from `%PROGRAMDATA%` to `%ProgramFiles%\Notepad++\plugins\`. - -Hopefully, the latest change is final. - -I've updated the 3P documentation to reflect those changes. If you update to the latest version of notepad++ from an older version (<= 7.6), you will have to manually place the `3P.dll` into a `3P` sub folder of your `plugins` folder. Otherwise, 3P will simply not be loaded. Alternatively, you can reinstall 3P from the new "plugins admin" menu in notepad++. - -Enjoy! \ No newline at end of file +Hello folks, long time no see! + +A pretty light release that ships the correction of a bug occurring with notepad++ (x64 only) v7.7 and above. + +A big shout out and thanks to [@thony8](https://github.com/thony8) for fixing this issue :) + +### Fixed issues ### + +- \#263: 3P now works correctly for notepad++ 64 bits and the scintilla version shipped with notepad++ v7.7 and above.