diff --git a/.github/workflows/dotnet-desktop.yml b/.github/workflows/dotnet-desktop.yml index 538262e..988e44d 100644 --- a/.github/workflows/dotnet-desktop.yml +++ b/.github/workflows/dotnet-desktop.yml @@ -42,7 +42,7 @@ jobs: - name: Install .NET uses: actions/setup-dotnet@v1 with: - dotnet-version: 7.0.x + dotnet-version: 6.0.x # Add MSBuild to the PATH: https://github.com/microsoft/setup-msbuild - name: Setup MSBuild.exe diff --git a/TestLexer/FormMain.Designer.cs b/TestLexer/FormMain.Designer.cs index bbb84c2..410c42f 100644 --- a/TestLexer/FormMain.Designer.cs +++ b/TestLexer/FormMain.Designer.cs @@ -1,4 +1,6 @@ -namespace TestLexer +using System.Drawing; + +namespace TestLexer { partial class FormMain { @@ -29,79 +31,87 @@ protected override void Dispose(bool disposing) private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormMain)); - this.scintilla = new ScintillaNET.Scintilla(); - this.msMain = new System.Windows.Forms.MenuStrip(); - this.mnuFile = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuOpen = new System.Windows.Forms.ToolStripMenuItem(); - this.mnuTestMarkLoad = new System.Windows.Forms.ToolStripMenuItem(); - this.odFile = new System.Windows.Forms.OpenFileDialog(); - this.msMain.SuspendLayout(); - this.SuspendLayout(); + scintilla = new ScintillaNET.Scintilla(); + msMain = new System.Windows.Forms.MenuStrip(); + mnuFile = new System.Windows.Forms.ToolStripMenuItem(); + mnuOpen = new System.Windows.Forms.ToolStripMenuItem(); + mnuTestMarkLoad = new System.Windows.Forms.ToolStripMenuItem(); + odFile = new System.Windows.Forms.OpenFileDialog(); + msMain.SuspendLayout(); + SuspendLayout(); // // scintilla // - this.scintilla.Dock = System.Windows.Forms.DockStyle.Fill; - this.scintilla.EdgeColor = System.Drawing.Color.Black; - this.scintilla.Location = new System.Drawing.Point(0, 24); - this.scintilla.Name = "scintilla"; - this.scintilla.Size = new System.Drawing.Size(800, 426); - this.scintilla.TabIndex = 0; - this.scintilla.LocationChanged += new System.EventHandler(this.Scintilla_LocationChanged); - this.scintilla.Click += new System.EventHandler(this.Scintilla_LocationChanged); + scintilla.AutoCMaxHeight = 9; + scintilla.BiDirectionality = ScintillaNET.BiDirectionalDisplayType.Disabled; + scintilla.CaretLineBackColor = System.Drawing.Color.Black; + scintilla.CaretLineBackColor = Color.Yellow; + scintilla.Dock = System.Windows.Forms.DockStyle.Fill; + scintilla.EdgeColor = System.Drawing.Color.Black; + scintilla.LexerName = null; + scintilla.Location = new System.Drawing.Point(0, 24); + scintilla.Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + scintilla.Name = "scintilla"; + scintilla.ScrollWidth = 1; + scintilla.Size = new System.Drawing.Size(933, 495); + scintilla.TabIndents = true; + scintilla.TabIndex = 0; + scintilla.UseRightToLeftReadingLayout = false; + scintilla.WrapMode = ScintillaNET.WrapMode.None; + scintilla.LocationChanged += Scintilla_LocationChanged; + scintilla.Click += Scintilla_LocationChanged; // // msMain // - this.msMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mnuFile}); - this.msMain.Location = new System.Drawing.Point(0, 0); - this.msMain.Name = "msMain"; - this.msMain.Size = new System.Drawing.Size(800, 24); - this.msMain.TabIndex = 1; - this.msMain.Text = "menuStrip1"; + msMain.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { mnuFile }); + msMain.Location = new System.Drawing.Point(0, 0); + msMain.Name = "msMain"; + msMain.Padding = new System.Windows.Forms.Padding(7, 2, 0, 2); + msMain.Size = new System.Drawing.Size(933, 24); + msMain.TabIndex = 1; + msMain.Text = "menuStrip1"; // // mnuFile // - this.mnuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.mnuOpen, - this.mnuTestMarkLoad}); - this.mnuFile.Name = "mnuFile"; - this.mnuFile.Size = new System.Drawing.Size(37, 20); - this.mnuFile.Text = "File"; + mnuFile.DropDownItems.AddRange(new System.Windows.Forms.ToolStripItem[] { mnuOpen, mnuTestMarkLoad }); + mnuFile.Name = "mnuFile"; + mnuFile.Size = new System.Drawing.Size(37, 20); + mnuFile.Text = "File"; // // mnuOpen // - this.mnuOpen.Name = "mnuOpen"; - this.mnuOpen.Size = new System.Drawing.Size(150, 22); - this.mnuOpen.Text = "Open"; - this.mnuOpen.Click += new System.EventHandler(this.mnuOpen_Click); + mnuOpen.Name = "mnuOpen"; + mnuOpen.Size = new System.Drawing.Size(150, 22); + mnuOpen.Text = "Open"; + mnuOpen.Click += mnuOpen_Click; // // mnuTestMarkLoad // - this.mnuTestMarkLoad.Name = "mnuTestMarkLoad"; - this.mnuTestMarkLoad.Size = new System.Drawing.Size(150, 22); - this.mnuTestMarkLoad.Text = "Test mark load"; - this.mnuTestMarkLoad.Click += new System.EventHandler(this.MnuTestMarkLoad_Click); + mnuTestMarkLoad.Name = "mnuTestMarkLoad"; + mnuTestMarkLoad.Size = new System.Drawing.Size(150, 22); + mnuTestMarkLoad.Text = "Test mark load"; + mnuTestMarkLoad.Click += MnuTestMarkLoad_Click; // // odFile // - this.odFile.Filter = "All files|*.*"; + odFile.Filter = "All files|*.*"; // // FormMain // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(800, 450); - this.Controls.Add(this.scintilla); - this.Controls.Add(this.msMain); - this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); - this.MainMenuStrip = this.msMain; - this.Name = "FormMain"; - this.Text = "A test program for the ScintillaNET lexers © VPKSoft 2020"; - this.msMain.ResumeLayout(false); - this.msMain.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new System.Drawing.SizeF(7F, 15F); + AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + ClientSize = new System.Drawing.Size(933, 519); + Controls.Add(scintilla); + Controls.Add(msMain); + Icon = (System.Drawing.Icon)resources.GetObject("$this.Icon"); + MainMenuStrip = msMain; + Margin = new System.Windows.Forms.Padding(4, 3, 4, 3); + Name = "FormMain"; + Text = "Scintilla.NET.TestApp"; + msMain.ResumeLayout(false); + msMain.PerformLayout(); + ResumeLayout(false); + PerformLayout(); } #endregion diff --git a/TestLexer/FormMain.cs b/TestLexer/FormMain.cs index a43399d..6d97083 100644 --- a/TestLexer/FormMain.cs +++ b/TestLexer/FormMain.cs @@ -29,10 +29,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using System.Drawing; using System.IO; using System.Windows.Forms; -using VPKSoft.ScintillaLexers; -using VPKSoft.ScintillaLexers.CreateSpecificLexer; -using VPKSoft.ScintillaLexers.ScintillaNotepadPlusPlus; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers; +using ScintillaLexers.CreateSpecificLexer; +using ScintillaLexers.ScintillaNotepadPlusPlus; namespace TestLexer; @@ -49,7 +48,7 @@ private void mnuOpen_Click(object sender, EventArgs e) { if (odFile.ShowDialog() == DialogResult.OK) { - ScintillaLexers.CreateLexer(scintilla, odFile.FileName); + ScintillaLexer.CreateLexer(scintilla, odFile.FileName); scintilla.Text = File.ReadAllText(odFile.FileName); } } diff --git a/TestLexer/FormMain.resx b/TestLexer/FormMain.resx index 21b3d3c..39089a5 100644 --- a/TestLexer/FormMain.resx +++ b/TestLexer/FormMain.resx @@ -1,17 +1,17 @@  - @@ -126,78 +126,235 @@ - AAABAAEAICAAAAEAIACoEAAAFgAAACgAAAAgAAAAQAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAEAAAADwAAAAAAAAAAAAAAAAAAAABZW1oUVFlgGEdMTA5NQ0MhOD9LLEQ0MSxBUVkbXk8/EwAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAEAAAAKAAAAAAAAAAAAAAAAAAAAAFaEdQFUXGcCWElFAmRWVwIaJTAEQS4gA0ZG - PQRQWWQCAAAAAAAAAAAAAAAAAAAAAAAAAACRYQAHHBIAOg0IAFwDAgA+AAAACAAAAABmRAACHBIAOhEL - AFsSDABaAAAAIgAAAAEAAAAAAAAAAQAAAAwAAAAAAAAAAAAAAAAAAAAAUktQFAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAzIgAAsKBAFWEWADaWDoA/xkQAMwAAAAaAAAAAJtn - AG1tSQD9bEgA/1U4APAAAAAsAAAAAAAAAAAAAAABAAAACQAAAAAAAAAAAAAAAAAAAABRS1IaAAAAAEBN - WANKR0UGOmd8AmxPOgRCSEgGRkVEBUNCSwVMTkwHVVBDBUtRWQaLYh8KyIUApcyIAP+udAD/MSAAygYK - DRy/gAMsv38A+syIAP/KhgD/elEAkDVATAZAQz8IWkw7BgAAAAEAAAAJAAAAAAAAAAAAAAAAAAAAAEU9 - LQEAAAAAQE1ZKEpGRFQ1YHYdaUw2MUJISE1GRURCQ0JKOUtOTVVTTkFHS1FZRVNDPUK5fwy2zIgA/6Zu - AP8vIALPJztPO6pyAePMiAD/zIgA/3tSAtRDP0oqNUBMRUBDP11cTT5MAAAAAAAAAAkAAAAAAAAAAAAA - AAAAAAAATWZeGwAAAAAAAAAAACAyBAAINgMAAAAAAAAAAAAAAAAAAAAAAAAAACM1LQoAAAAAzIgABMmG - AJzMiAD/pm4A/yIWAL6TYgCmxoQA/8yIAP+caADzAAAADgAAAAAAAAAAAAAAAAAAAAAAAAADAAAADgAA - AAAAAAAAAAAAAAAAAADOSEY0/yUoJf8qMSH/MiQM/xQ4GP8wGyX/IykU/yYoGf8uNBP/LCwj/zIcDVFY - VStNPzgvuX4IscyIAP+hawD/YUIC47B1APvMiAD/vn4A/20lDlf/JhwiZF5aGU5GThdFS1UZXFZQKAAA - AAMAAAAPAAAAAAAAAAAAAAAAAAAAAP8eIBT/IiYc/ygtHv8uHAv/CSoa/ycQHf8ZIiH/KRQS/ygtCv8i - Khn/LQ0QQ01YKk07KyvAgASnzIgA/6xzAP+tcwD+zIgA/8yIAP9ILgK//xkrH/8aExdWS1sWUDE+FDkt - VxNLQkEkAAAAAQAAAAoAAAAAAAAAAAAAAAAAAAAAW1taG1dXYB9WU0wXQj07MzpDSSgzMSk5bVtHFT48 - RDo4MzkyOEQ8HTYzNTs9RDgpX2Q+I7iHCLLMiAD/wIAA/8OCAP3MiAD/nmkA/wQDAPcdRR9jTpNQJkOL - GjBAh1lbOpQ1UFaNLykAAAABAAAACQAAAAAAAAAAAAAAAAAAAABaXFkLVlVbDUJVVQlEQDwXQExNDTo4 - KRW2fhQamW4dNJBmGSlfSSYNUEhAFTlDTRBHMxgUxIUCocyIAP+hawD/h1sA5MiGAPXMiAD/WjwA/wEC - AdEVPCgmTZE9LgCq/wNRlD0ZUZdDFAAAAAEAAAAJAAAAAAAAAAAAAAAAAAAAAFdbWxJRWmUVXFRKEEQ+ - PB8tPkciPzUjM7N4A6zKhwD8vH0Bx5BnGTNQTlAWNEA/GU88HhrChASkzIgA/6RtAP81JQHRuoQEucyI - AP/GhAD/OCUA/gUNBqU1gzYrW5RNDDWTRC1plUMdAAAAAQAAAAkAAAAAAAAAAAAAAAAAAAAAWVxaD1VX - XxNcUFQJU0pOFCYwThY9Ihklj18A5MyIAP+ocADum2cAKgAAAAAAAAAAzIgABMmGAJzMiAD/pm4A/ykb - AMlyTAAyzIgA5cyIAP+zdwD/FQ4A+QAAAFwAAAAAAAAAAAAAAAAAAAAAAAAACQAAAAAAAAAAAAAAAAAA - AABYW1sTVVRkFT2JRyNJlEdKOpQ+PlONSFCQYgDizIgA/6ZwAfBnfi9XOYwrPkWQST1Skk5Gs4gKvMyI - AP+ocAD+MiQDvyVSBzarihZ6zIgA/syIAP+ZZgD8AwYBzhlSKk9FijAwR45BOgAAAAQAAAAQAAAAAAAA - AAAAAAAAAAAAAFdZWhJTV2AYSGhJEUpbRC1AWE83TEwxQZBhAePMiAD/s3cA8sKIBWm7iARRuYkKQZWM - Ih3FiAOMy4gA6cqIAbfAiQosP4sMB0KRYAnIiAGnyogA4MqIANjHiAFuLJFKCkaKLwlFjUAKAAAAAgAA - AAsAAAAAAAAAAAAAAAAAAAAAWl5bC1dcYgpDRU0IUUVDCRggKw1EMBAZkWAA4MyIAP/LhwD/yoYA/smG - APvEggDryYYAucyIAEgAAAAAAAAAAAAAAAAAAAAAzIgAAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAABAAAACQAAAAAjNKYBd2UkAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAFU4AAySYQDezIgA/7h7 - AP+EWAD/iFoA/8yIAP/MiAD/xoQA4MyIADsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAJAAAAACA7ngtebycMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAVTgADJJh - AN7MiAD/omwA9isdAJUAAACeMyIA/cyIAP/MiAD/wYAAmgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAABAAAAA8AAAAAlh1jDucuHCf/HSYu/yITH/8rJBX/JS8Z/yciK/8e - IR58XBgbkWEA4cyIAP+pcADvpncJO5RsGh8GBABfzIgA/8yIAP+9fgC8AAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACExISDltnYgf/ACIC8T0XHuFdEEDaawc/1HgGNv8n - LxT/KCQc/xohEH9fER6RYQDhzIgA/6xzAPCveAVMs30IPJ9qAI7MiAD/zIgA/690ALAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAuPDUQSW1hFQAAAACeaQBVu30A2MCA - AOXEggDmzIgAHQAAAAAAAAAAXj4ADZNiAN/MiAD/xIMA/MKBANbBgQDXzIgA/8yIAP+6fAD/hlkAWwAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABGkUGxv/QDpA/ywqQZJY - A8/MiAD/zIgA/8yIAP+ndA2lT09JRk5KZCdYQiAmil0B48uHAP/EgwD/yIUA/saEAP6zdwD/gFUA/zsn - ALcAAAALAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABiwMQBv8I - EhCyVQUxo2wA7syIAP+zdwD/yoYA/8GBAPBNRTgSJyg1LS0aAA8GBgOoBAMA9wUDAPAFAwDxBQMA7QUE - ANEFAwB0AAAAEgAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AABnChAF/yAiCYFQAnXHhAD+zIgA/2lGANbCgQD/y4cA/7+BBUM1R0wGY0c/Bys3TAdTT0kLU1pUBlJb - WQxNQj8IQ1NcDks4LAxCSlUNT1FTCmdhTgtvY0cBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAHYSGxH2PSYqkloCxMyIAP+ibAD6PzARZbF2AP/LhwD/sHcDvkFARSdRS00pOkRYMWBZ - RilFR00eVl1aMkk+OzNGUlw4QTYxN0BDSzhSU1MvaWRUG2dfUQIAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAApxsnFsM6Gl+zdQD1zIgA/4JYBdpKSEZGeVEA+8yIAP/AgAHydWZCQFBW - YAtES2EMdm9KBz4/TwVhZ2ELSkA6DU1WYws4MTEOQD9FD1RUUw1saF4EAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABoBgwNlUsEccyIAP/KhgD/d1IKlUpHLxRCLgO8zIgA/8aE - APuzegZuMyEWFSU8QhJCPzUZQUNCHCIsNw9AMDQQMkFBFHtuTA4AAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI4tGxuiZQPNzIgA/6hwAPpuViFwTUpONx0f - H32+fgD/zIgA/7V6Bs5GQDZFTVNbQ19IQD03Oz4rPERNNlVERkpEV1AoZjFJDgAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgzUMJcGAAPzMiAD/lmEA30ZB - Ok5QS0UsKiwuS31TAPjMiAD/vn8C65RvIU8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACbYgJszIgA/8qG - AP+OVwCrREZHN0VFRCktMjRGQSwCxcyIAP/IhQD9sXkNjwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAI9e - AMyxdgD/mGQA+4ZDBG8/QkpBT0c+Lj5BRDwYEw6HpG0A/7B1AP+yeAa1MENVDUI6KxVVVlITS1hdEkI4 - KxNhenwQQTEpCjk8QRVWRToMAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAPSQCdkgkBJ9YJAeGnSUHJkhISS9ISkooPEBDNyQdH0AwIgeWNCkMp19AEGgvN1gtV1M9MEtN - SjZPVWAfNjEyP0tfXjlBNzQ0U01RKFxOLQ8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAVrEBck8ysrRfgqK0//KxUtREVKX0tIREc6PkJcTT88S0xUVBETIygGMyMYBS40 - WAJcWUICSktJA1FVYAE0MTMDSFtaA0E3NQNaU1UCYFMlAQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA - AAAAAAAAAAAAAAAAAAAAAAAA//////////////HH///hh///4Q///+Af///gP///4D///+A////gH//x - 4A//8eEP//Hhh//x44//8B////AP///wB///8cf///GH//jwD//wcA//8HA///B////iP///4j///+I/ - ///HH///xx///8cP//+PD///z5////////8= + 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 + EfL/5tH0oEsJcuEAAAAASUVORK5CYII= \ No newline at end of file diff --git a/TestLexer/Properties/Resources.Designer.cs b/TestLexer/Properties/Resources.Designer.cs index 5565e5e..d5ba5bf 100644 --- a/TestLexer/Properties/Resources.Designer.cs +++ b/TestLexer/Properties/Resources.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace TestLexer.Properties { +namespace ScintillaLexers.NET.TestApp.Properties { using System; @@ -19,7 +19,7 @@ namespace TestLexer.Properties { // class via a tool like ResGen or Visual Studio. // To add or remove a member, edit your .ResX file then rerun ResGen // with the /str option, or rebuild your VS project. - [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")] + [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")] [global::System.Diagnostics.DebuggerNonUserCodeAttribute()] [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()] internal class Resources { @@ -39,7 +39,7 @@ internal Resources() { internal static global::System.Resources.ResourceManager ResourceManager { get { if (object.ReferenceEquals(resourceMan, null)) { - global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("TestLexer.Properties.Resources", typeof(Resources).Assembly); + global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("ScintillaLexers.NET.TestApp.Properties.Resources", typeof(Resources).Assembly); resourceMan = temp; } return resourceMan; diff --git a/TestLexer/TestLexer.csproj b/TestLexer/ScintillaLexers.NET.TestApp.csproj similarity index 88% rename from TestLexer/TestLexer.csproj rename to TestLexer/ScintillaLexers.NET.TestApp.csproj index 6c1200e..ea04c9e 100644 --- a/TestLexer/TestLexer.csproj +++ b/TestLexer/ScintillaLexers.NET.TestApp.csproj @@ -1,55 +1,56 @@ - - - WinExe - net7-windows - - TestLexer - VPKSoft - TestLexer - A test application for the ScintillaLexers library containing lexer definitions for the ScintillaNET. - Copyright © VPKSoft 2020 - bin\$(Configuration)\ - true - - - full - - - pdbonly - - - - - - - - - - - FormMain.cs - - - FormMain.cs - - - ResXFileCodeGenerator - Resources.Designer.cs - Designer - - - True - Resources.resx - True - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - True - Settings.settings - True - - + + + WinExe + net6.0-windows7.0 + + TestLexer + VPKSoft + TestLexer + A test application for the ScintillaLexers library containing lexer definitions for the ScintillaNET. + Copyright © desjarlais 2023 + bin\$(Configuration)\ + true + + + full + + + pdbonly + + + + + + + + + + + FormMain.cs + + + FormMain.cs + + + ResXFileCodeGenerator + Resources.Designer.cs + Designer + + + True + Resources.resx + True + + + SettingsSingleFileGenerator + Settings.Designer.cs + + + + + True + Settings.settings + True + + \ No newline at end of file diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerBatch.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerBatch.cs index 1a290ee..58be29e 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerBatch.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerBatch.cs @@ -25,17 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using ScintillaLexers.LexerColors; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the Batch lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerBatch: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCommon.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCommon.cs index a32f626..c6933a1 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCommon.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCommon.cs @@ -27,11 +27,11 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using System.Drawing; using System.Linq; using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using static VPKSoft.ScintillaLexers.LexerEnumerations; -using static VPKSoft.ScintillaLexers.GlobalScintillaFont; +using ScintillaLexers.HelperClasses; +using static ScintillaLexers.LexerEnumerations; +using static ScintillaLexers.GlobalScintillaFont; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A base class for creating static lexers. diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCpp.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCpp.cs index 2a6a807..2be044a 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCpp.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCpp.cs @@ -25,17 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using ScintillaLexers.LexerColors; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the C++ lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerCpp: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCs.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCs.cs index 0490432..2cdceee 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCs.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCs.cs @@ -25,17 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using ScintillaLexers.LexerColors; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the C# lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerCs: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCss.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCss.cs index 3a4dc2b..631e953 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCss.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerCss.cs @@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; internal abstract class CreateLexerCss: CreateLexerCommon { diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerErrorList.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerErrorList.cs index 7ec4a51..65aeded 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerErrorList.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerErrorList.cs @@ -26,9 +26,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using System.Drawing; using ScintillaNET; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; internal abstract class CreateLexerErrorList : CreateLexerCommon { diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerHtml.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerHtml.cs index 4888176..b19dcaa 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerHtml.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerHtml.cs @@ -25,17 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using ScintillaLexers.LexerColors; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the HTML lexer. -/// Implements the +/// Implements the /// -/// +/// internal abstract class CreateLexerHtml: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerIni.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerIni.cs index e7e67e1..7c8eef4 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerIni.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerIni.cs @@ -25,16 +25,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.LexerColors; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the INI lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerIni: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerInnoSetup.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerInnoSetup.cs index a154266..252a53b 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerInnoSetup.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerInnoSetup.cs @@ -25,11 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; // ReSharper disable once CommentTypo /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerJava.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerJava.cs index 2e47c0e..e39be23 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerJava.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerJava.cs @@ -25,16 +25,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the Java lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerJava : CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerJavaScript.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerJavaScript.cs index 496df5f..4a06c32 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerJavaScript.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerJavaScript.cs @@ -25,10 +25,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; internal abstract class CreateLexerJavaScript: CreateLexerCommon { diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerJson.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerJson.cs index d1b45ae..a9a6270 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerJson.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerJson.cs @@ -24,22 +24,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE */ #endregion -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the YAML lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerJson: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerNsis.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerNsis.cs index 0f081d3..0fd69e1 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerNsis.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerNsis.cs @@ -25,17 +25,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the NSIS lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerNsis: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerNull.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerNull.cs index 64d8e2b..2dfdd05 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerNull.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerNull.cs @@ -26,13 +26,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using ScintillaNET; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for plain text. -/// Implements the +/// Implements the /// -/// +/// internal abstract class CreateLexerNull: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPascal.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPascal.cs index 3ee6e44..acd5e71 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPascal.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPascal.cs @@ -25,17 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using ScintillaLexers.LexerColors; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the Pascal lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerPascal: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPhp.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPhp.cs index 13d5670..6f0eeb9 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPhp.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPhp.cs @@ -25,17 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using ScintillaLexers.LexerColors; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the PHP lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerPhp: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPowerShell.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPowerShell.cs index 5787738..a4b8e92 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPowerShell.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPowerShell.cs @@ -25,17 +25,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the Windows PowerShell lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerPowerShell: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPython.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPython.cs index 8ff928d..1839aba 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPython.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerPython.cs @@ -25,17 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using ScintillaLexers.LexerColors; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the Python lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerPython: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerSql.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerSql.cs index d225595..78fc976 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerSql.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerSql.cs @@ -25,17 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using ScintillaLexers.LexerColors; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the SQL lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerSql: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerVb.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerVb.cs index a51ba88..b82dddf 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerVb.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerVb.cs @@ -25,17 +25,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using ScintillaLexers.LexerColors; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the Batch lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerVb: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerXml.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerXml.cs index 2831053..c381bf9 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerXml.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerXml.cs @@ -25,16 +25,16 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE #endregion using ScintillaNET; -using VPKSoft.ScintillaLexers.LexerColors; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.LexerColors; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the XML lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerXml: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerYaml.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerYaml.cs index 7abaca2..733bb3b 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerYaml.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/CreateLexerYaml.cs @@ -24,22 +24,17 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE */ #endregion -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; using ScintillaNET; -using VPKSoft.ScintillaLexers.HelperClasses; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.HelperClasses; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class for the YAML lexer. -/// Implements the +/// Implements the /// -/// +/// public abstract class CreateLexerYaml: CreateLexerCommon { /// diff --git a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/LexerFoldProperties.cs b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/LexerFoldProperties.cs index 7b18d49..07df25c 100644 --- a/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/LexerFoldProperties.cs +++ b/VPKSoft.ScintillaLexers.NET/CreateSpecificLexer/LexerFoldProperties.cs @@ -26,9 +26,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using System.Collections.Generic; using ScintillaNET; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.CreateSpecificLexer; +namespace ScintillaLexers.CreateSpecificLexer; /// /// A class containing code folding properties for different lexers. diff --git a/VPKSoft.ScintillaLexers.NET/GlobalScintillaFont.cs b/VPKSoft.ScintillaLexers.NET/GlobalScintillaFont.cs index 4dfa634..2f5a8f8 100644 --- a/VPKSoft.ScintillaLexers.NET/GlobalScintillaFont.cs +++ b/VPKSoft.ScintillaLexers.NET/GlobalScintillaFont.cs @@ -26,7 +26,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using ScintillaNET; -namespace VPKSoft.ScintillaLexers; +namespace ScintillaLexers; /// /// A class to set the basic font style for the . diff --git a/VPKSoft.ScintillaLexers.NET/HelperClasses/LexerFileExtensions.cs b/VPKSoft.ScintillaLexers.NET/HelperClasses/LexerFileExtensions.cs index 425ee17..c20f310 100644 --- a/VPKSoft.ScintillaLexers.NET/HelperClasses/LexerFileExtensions.cs +++ b/VPKSoft.ScintillaLexers.NET/HelperClasses/LexerFileExtensions.cs @@ -29,9 +29,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using System.IO; using System.Linq; using System.Text; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.HelperClasses; +namespace ScintillaLexers.HelperClasses; /// /// A class containing lexer known file extensions for different lexers. diff --git a/VPKSoft.ScintillaLexers.NET/HelperClasses/LexerTypeName.cs b/VPKSoft.ScintillaLexers.NET/HelperClasses/LexerTypeName.cs index 3f675b1..1876d11 100644 --- a/VPKSoft.ScintillaLexers.NET/HelperClasses/LexerTypeName.cs +++ b/VPKSoft.ScintillaLexers.NET/HelperClasses/LexerTypeName.cs @@ -29,7 +29,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using System.Linq; using ScintillaNET; -namespace VPKSoft.ScintillaLexers.HelperClasses; +namespace ScintillaLexers.HelperClasses; /// /// A helper class for Class LexerTypeName. @@ -62,26 +62,24 @@ public class LexerTypeName public static readonly List> LexerTypeNameList = new List>( new[] { - Tuple.Create(LexerEnumerations.LexerType.Unknown, "text", Lexer.Null), - Tuple.Create(LexerEnumerations.LexerType.Cs, "cs", Lexer.Cpp), - Tuple.Create(LexerEnumerations.LexerType.Cpp, "cpp", Lexer.Cpp), - Tuple.Create(LexerEnumerations.LexerType.Xml, "xml", Lexer.Xml), - Tuple.Create(LexerEnumerations.LexerType.Text, "text", Lexer.Null), - Tuple.Create(LexerEnumerations.LexerType.Nsis, "nsis", (Lexer)SCLEX_NSIS), - Tuple.Create(LexerEnumerations.LexerType.InnoSetup, "inno", (Lexer)SCLEX_INNOSETUP), - Tuple.Create(LexerEnumerations.LexerType.SQL, "sql", Lexer.Xml), - Tuple.Create(LexerEnumerations.LexerType.Batch, "batch", Lexer.Batch), - Tuple.Create(LexerEnumerations.LexerType.Pascal, "pascal", Lexer.Pascal), - Tuple.Create(LexerEnumerations.LexerType.PHP, "php", Lexer.PhpScript), - Tuple.Create(LexerEnumerations.LexerType.WindowsPowerShell, "powershell", Lexer.PowerShell), - Tuple.Create(LexerEnumerations.LexerType.INI, "ini", Lexer.Properties), - Tuple.Create(LexerEnumerations.LexerType.Python, "python", Lexer.Python), - Tuple.Create(LexerEnumerations.LexerType.YAML, "yaml", (Lexer)SCLEX_YAML), - Tuple.Create(LexerEnumerations.LexerType.Java, "java", Lexer.Cpp), - Tuple.Create(LexerEnumerations.LexerType.Css, "css", Lexer.Css), - Tuple.Create(LexerEnumerations.LexerType.VbDotNet, "vb", Lexer.Vb), - Tuple.Create(LexerEnumerations.LexerType.Json, "json", Lexer.Json), - Tuple.Create(LexerEnumerations.LexerType.ErrorList, "errorlist", (Lexer)SCLEX_ERRORLIST), + Tuple.Create(LexerEnumerations.LexerType.Cs, "cs", Lexer.SCLEX_CSHARP), + Tuple.Create(LexerEnumerations.LexerType.Cpp, "cpp", Lexer.SCLEX_CPP), + Tuple.Create(LexerEnumerations.LexerType.Xml, "xml", Lexer.SCLEX_XML), + Tuple.Create(LexerEnumerations.LexerType.Nsis, "nsis", Lexer.SCLEX_NSIS), + Tuple.Create(LexerEnumerations.LexerType.InnoSetup, "inno", Lexer.SCLEX_INNOSETUP), + Tuple.Create(LexerEnumerations.LexerType.SQL, "sql", Lexer.SCLEX_SQL), + Tuple.Create(LexerEnumerations.LexerType.Batch, "batch", Lexer.SCLEX_BATCH), + Tuple.Create(LexerEnumerations.LexerType.Pascal, "pascal", Lexer.SCLEX_PASCAL), + Tuple.Create(LexerEnumerations.LexerType.PHP, "php", Lexer.SCLEX_PHPSCRIPT), + Tuple.Create(LexerEnumerations.LexerType.WindowsPowerShell, "powershell", Lexer.SCLEX_POWERSHELL), + Tuple.Create(LexerEnumerations.LexerType.INI, "ini", Lexer.SCLEX_PROPERTIES), + Tuple.Create(LexerEnumerations.LexerType.Python, "python", Lexer.SCLEX_PYTHON), + Tuple.Create(LexerEnumerations.LexerType.YAML, "yaml", Lexer.SCLEX_YAML), + Tuple.Create(LexerEnumerations.LexerType.Java, "java", Lexer.SCLEX_JAVA), + Tuple.Create(LexerEnumerations.LexerType.Css, "css", Lexer.SCLEX_CSS), + Tuple.Create(LexerEnumerations.LexerType.VbDotNet, "vb", Lexer.SCLEX_VB), + Tuple.Create(LexerEnumerations.LexerType.Json, "json", Lexer.SCLEX_JSON), + Tuple.Create(LexerEnumerations.LexerType.ErrorList, "errorlist", Lexer.SCLEX_ERRORLIST), }); /// diff --git a/VPKSoft.ScintillaLexers.NET/HelperClasses/ScintillaKeyWords.cs b/VPKSoft.ScintillaLexers.NET/HelperClasses/ScintillaKeyWords.cs index 87e851a..a5180c8 100644 --- a/VPKSoft.ScintillaLexers.NET/HelperClasses/ScintillaKeyWords.cs +++ b/VPKSoft.ScintillaLexers.NET/HelperClasses/ScintillaKeyWords.cs @@ -27,9 +27,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using System.Collections.Generic; using System.Linq; using ScintillaNET; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.HelperClasses; +namespace ScintillaLexers.HelperClasses; /// /// A class for keywords for different lexers. diff --git a/VPKSoft.ScintillaLexers.NET/LexerColors/LexerColors.cs b/VPKSoft.ScintillaLexers.NET/LexerColors/LexerColors.cs index 4534dee..4c22a85 100644 --- a/VPKSoft.ScintillaLexers.NET/LexerColors/LexerColors.cs +++ b/VPKSoft.ScintillaLexers.NET/LexerColors/LexerColors.cs @@ -31,9 +31,9 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using System.IO; using System.Linq; using System.Xml.Linq; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using static ScintillaLexers.LexerEnumerations; -namespace VPKSoft.ScintillaLexers.LexerColors; +namespace ScintillaLexers.LexerColors; /// /// A class containing the colors for the lexers. diff --git a/VPKSoft.ScintillaLexers.NET/LexerEnumerations.cs b/VPKSoft.ScintillaLexers.NET/LexerEnumerations.cs index cfd08b3..26151b6 100644 --- a/VPKSoft.ScintillaLexers.NET/LexerEnumerations.cs +++ b/VPKSoft.ScintillaLexers.NET/LexerEnumerations.cs @@ -24,7 +24,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE */ #endregion -namespace VPKSoft.ScintillaLexers; +namespace ScintillaLexers; /// /// A class containing the enumeration values. diff --git a/VPKSoft.ScintillaLexers.NET/ScintillaLexers.cs b/VPKSoft.ScintillaLexers.NET/ScintillaLexer.cs similarity index 97% rename from VPKSoft.ScintillaLexers.NET/ScintillaLexers.cs rename to VPKSoft.ScintillaLexers.NET/ScintillaLexer.cs index 1425b82..c55cd99 100644 --- a/VPKSoft.ScintillaLexers.NET/ScintillaLexers.cs +++ b/VPKSoft.ScintillaLexers.NET/ScintillaLexer.cs @@ -27,10 +27,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // (C)::https://github.com/jacobslusser/ScintillaNET using System.Xml.Linq; using ScintillaNET; -using VPKSoft.ScintillaLexers.CreateSpecificLexer; -using VPKSoft.ScintillaLexers.HelperClasses; -using VPKSoft.ScintillaLexers.ScintillaNotepadPlusPlus; -using static VPKSoft.ScintillaLexers.LexerEnumerations; +using ScintillaLexers.CreateSpecificLexer; +using ScintillaLexers.HelperClasses; +using ScintillaLexers.ScintillaNotepadPlusPlus; +using static ScintillaLexers.LexerEnumerations; // (C)::https://github.com/notepad-plus-plus/notepad-plus-plus @@ -38,12 +38,12 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE // (C)::https://github.com/jacobslusser/ScintillaNET // (C)::https://www.scintilla.org -namespace VPKSoft.ScintillaLexers; +namespace ScintillaLexers; /// /// A class for setting a lexer for a Scintilla class instance. /// -public static class ScintillaLexers +public static class ScintillaLexer { /// /// Gets or sets the value of a LexerColors class instance. diff --git a/VPKSoft.ScintillaLexers.NET/VPKSoft.ScintillaLexers.NET.csproj b/VPKSoft.ScintillaLexers.NET/ScintillaLexers.NET.csproj similarity index 60% rename from VPKSoft.ScintillaLexers.NET/VPKSoft.ScintillaLexers.NET.csproj rename to VPKSoft.ScintillaLexers.NET/ScintillaLexers.NET.csproj index cabfef7..3c5bb00 100644 --- a/VPKSoft.ScintillaLexers.NET/VPKSoft.ScintillaLexers.NET.csproj +++ b/VPKSoft.ScintillaLexers.NET/ScintillaLexers.NET.csproj @@ -1,39 +1,39 @@ - - - netcoreapp3.1;net462;net6-windows;net7-windows - VPKSoft.ScintillaLexers.NET - VPKSoft.ScintillaLexers.NET - Copyright © 2023 VPKSoft - bin\$(Configuration)\ - VPKSoft - A class library containing lexer definitions for the ScintillaNET. - MIT - https://github.com/VPKSoft/ScintillaLexers - vpksoft_logo.png - https://github.com/VPKSoft/ScintillaLexers - git - wrapper scintilla Scintilla.NET lexer - See: https://github.com/VPKSoft/ScintillaLexers - 1.1.16 - true - true - true - enable - VPKSoft.ScintillaLexers - Latest - - - - - - - - - True - - - - - - - + + + net481;net6-windows + VPKSoft.ScintillaLexers.NET + ScintillaLexers.NET + Copyright © 2023 VPKSoft + bin\$(Configuration)\ + desjarlais + A class library containing lexer definitions for the ScintillaNET. + MIT + https://github.com/desjarlais/ScintillaLexers + icon.png + https://github.com/desjarlais/ScintillaLexers + git + wrapper scintilla Scintilla.NET lexer + See: https://github.com/desjarlais/ScintillaLexers + 1.1.17 + true + true + true + enable + ScintillaLexers + Latest + + + + + + + + + True + + + + + + + diff --git a/VPKSoft.ScintillaLexers.NET/ScintillaNotepadPlusPlus/MarkColors.cs b/VPKSoft.ScintillaLexers.NET/ScintillaNotepadPlusPlus/MarkColors.cs index e6c6854..b070c4a 100644 --- a/VPKSoft.ScintillaLexers.NET/ScintillaNotepadPlusPlus/MarkColors.cs +++ b/VPKSoft.ScintillaLexers.NET/ScintillaNotepadPlusPlus/MarkColors.cs @@ -28,7 +28,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using System.Linq; using System.Xml.Linq; -namespace VPKSoft.ScintillaLexers.ScintillaNotepadPlusPlus; +namespace ScintillaLexers.ScintillaNotepadPlusPlus; /// /// A helper class to get the mark colors from the Notepad++ software XML lexer definition file. diff --git a/VPKSoft.ScintillaLexers.NET/ScintillaNotepadPlusPlus/ScintillaNotepadPlusPlusStyles.cs b/VPKSoft.ScintillaLexers.NET/ScintillaNotepadPlusPlus/ScintillaNotepadPlusPlusStyles.cs index 029585d..ea584c2 100644 --- a/VPKSoft.ScintillaLexers.NET/ScintillaNotepadPlusPlus/ScintillaNotepadPlusPlusStyles.cs +++ b/VPKSoft.ScintillaLexers.NET/ScintillaNotepadPlusPlus/ScintillaNotepadPlusPlusStyles.cs @@ -28,10 +28,10 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE using System.Linq; using System.Xml.Linq; using ScintillaNET; -using VPKSoft.ScintillaLexers.CreateSpecificLexer; -using VPKSoft.ScintillaLexers.HelperClasses; +using ScintillaLexers.CreateSpecificLexer; +using ScintillaLexers.HelperClasses; -namespace VPKSoft.ScintillaLexers.ScintillaNotepadPlusPlus; +namespace ScintillaLexers.ScintillaNotepadPlusPlus; /// /// A class for loading global styles for the from @@ -226,8 +226,8 @@ public static bool LoadScintillaStyleFromNotepadPlusXml(XDocument document, Scin } else if (style.Name == "Selected text colour") { - scintilla.SetSelectionForeColor(useSelectionColors, style.ColorForeground); - scintilla.SetSelectionBackColor(useSelectionColors, style.ColorBackground); + scintilla.SelectionTextColor = style.ColorForeground; + scintilla.SelectionBackColor = style.ColorBackground; } else if (style.Name == "Caret colour") { @@ -247,8 +247,8 @@ public static bool LoadScintillaStyleFromNotepadPlusXml(XDocument document, Scin } else if (style.Name == "White space symbol") // /// A helper class for Notepad++ XML style definition files. diff --git a/VPKSoft.ScintillaLexers.sln b/VPKSoft.ScintillaLexers.sln index 25f6520..fb57fd6 100644 --- a/VPKSoft.ScintillaLexers.sln +++ b/VPKSoft.ScintillaLexers.sln @@ -3,14 +3,14 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.32014.148 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestLexer", "TestLexer\TestLexer.csproj", "{D0B9D852-F1C1-41AF-BB29-3D4D968B4599}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScintillaLexers.NET.TestApp", "TestLexer\ScintillaLexers.NET.TestApp.csproj", "{D0B9D852-F1C1-41AF-BB29-3D4D968B4599}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{961E8E38-5FDE-48A0-831D-9FA94719D64E}" ProjectSection(SolutionItems) = preProject .github\workflows\dotnet-desktop.yml = .github\workflows\dotnet-desktop.yml EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VPKSoft.ScintillaLexers.NET", "VPKSoft.ScintillaLexers.NET\VPKSoft.ScintillaLexers.NET.csproj", "{CD400ADB-0B46-4DAD-97F5-B2829691A809}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScintillaLexers.NET", "VPKSoft.ScintillaLexers.NET\ScintillaLexers.NET.csproj", "{CD400ADB-0B46-4DAD-97F5-B2829691A809}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/vpksoft_logo.png b/vpksoft_logo.png deleted file mode 100644 index dd8f20d..0000000 Binary files a/vpksoft_logo.png and /dev/null differ