diff --git a/Configuration/GlobalAssemblyInfo.cs b/Configuration/GlobalAssemblyInfo.cs index d2dab2af0..143626f99 100644 --- a/Configuration/GlobalAssemblyInfo.cs +++ b/Configuration/GlobalAssemblyInfo.cs @@ -15,7 +15,7 @@ internal static class RevisionClass public const string Major = "3"; public const string Minor = "5"; public const string Build = "1"; - public const string Revision = "2250"; + public const string Revision = "2251"; public const string MainVersion = Major + "." + Minor; public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision; diff --git a/Configuration/Version.defs b/Configuration/Version.defs index c105f7e2c..040ec8b8a 100644 --- a/Configuration/Version.defs +++ b/Configuration/Version.defs @@ -1,4 +1,4 @@ -%COREVERSION%=1 -%REVISION%=2250 %MINOR%=5 +%REVISION%=2251 +%COREVERSION%=1 %MAJOR%=3 diff --git a/ICSharpCode.TextEditor/Src/Gui/TextEditorControl.cs b/ICSharpCode.TextEditor/Src/Gui/TextEditorControl.cs index 7a571e741..a40b7d75a 100644 --- a/ICSharpCode.TextEditor/Src/Gui/TextEditorControl.cs +++ b/ICSharpCode.TextEditor/Src/Gui/TextEditorControl.cs @@ -335,7 +335,7 @@ namespace ICSharpCode.TextEditor { float xPos = 0; float fontHeight = Font.GetHeight(g); -// bool gotNonWhitespace = false; + bool gotNonWhitespace = false; curTabIndent = 0 ; FontContainer fontContainer = TextEditorProperties.FontContainer; @@ -343,21 +343,21 @@ namespace ICSharpCode.TextEditor switch (word.Type) { case TextWordType.Space: Advance(ref xPos, ref yPos, margin.Width, primaryTextArea.TextArea.TextView.SpaceWidth, fontHeight); -// if (!gotNonWhitespace) { -// curTabIndent = xPos; -// } + if (!gotNonWhitespace) { + curTabIndent = xPos; + } break; case TextWordType.Tab: Advance(ref xPos, ref yPos, margin.Width, TabIndent * primaryTextArea.TextArea.TextView.WideSpaceWidth, fontHeight); -// if (!gotNonWhitespace) { -// curTabIndent = xPos; -// } + if (!gotNonWhitespace) { + curTabIndent = xPos; + } break; case TextWordType.Word: -// if (!gotNonWhitespace) { -// gotNonWhitespace = true; + if (!gotNonWhitespace) { + gotNonWhitespace = true; // curTabIndent += TabIndent * primaryTextArea.TextArea.TextView.GetWidth(' '); -// } + } g.DrawString(word.Word, word.GetFont(fontContainer), BrushRegistry.GetBrush(word.Color), xPos + margin.X, yPos); SizeF drawingSize = g.MeasureString(word.Word, word.GetFont(fontContainer), new SizeF(margin.Width, fontHeight * 100), printingStringFormat); Advance(ref xPos, ref yPos, margin.Width, drawingSize.Width, fontHeight); diff --git a/PABCNetHelp/LangGuide/Operations_Expressions/oppriority.html b/PABCNetHelp/LangGuide/Operations_Expressions/oppriority.html index e7e93e4df..bf85beadf 100644 --- a/PABCNetHelp/LangGuide/Operations_Expressions/oppriority.html +++ b/PABCNetHelp/LangGuide/Operations_Expressions/oppriority.html @@ -17,6 +17,10 @@ 1 (νΰθβϋρψθι) + + ** + 2 + *, /, @@ -27,14 +31,14 @@ shr, as, is - 2 + 3 +, - (αθνΰπνϋε), or, xor - 3 + 4 =, @@ -44,11 +48,11 @@ <=, >=, in - 4 + 5 ?:   - 5 (νθηψθι) + 6 (νθηψθι) diff --git a/Release/pabcversion.txt b/Release/pabcversion.txt index 5b1368f98..4e7871125 100644 --- a/Release/pabcversion.txt +++ b/Release/pabcversion.txt @@ -1 +1 @@ -3.5.1.2250 +3.5.1.2251 diff --git a/ReleaseGenerators/PascalABCNET_version.nsh b/ReleaseGenerators/PascalABCNET_version.nsh index e12430da5..93a5b22fa 100644 --- a/ReleaseGenerators/PascalABCNET_version.nsh +++ b/ReleaseGenerators/PascalABCNET_version.nsh @@ -1 +1 @@ -!define VERSION '3.5.1.2250' +!define VERSION '3.5.1.2251' diff --git a/TreeConverter/TreeConversion/syntax_tree_visitor.cs b/TreeConverter/TreeConversion/syntax_tree_visitor.cs index 534109e2a..a0e9da904 100644 --- a/TreeConverter/TreeConversion/syntax_tree_visitor.cs +++ b/TreeConverter/TreeConversion/syntax_tree_visitor.cs @@ -16613,7 +16613,7 @@ namespace PascalABCCompiler.TreeConverter sil = context.converted_type.base_type.find_in_type(cmn.name, context.CurrentScope); if (sil != null) { - while (sil.Count() != 0) + while (sil.Count != 0) { if (!cmn.is_constructor) { diff --git a/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesPlugin.cs b/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesPlugin.cs index 380ab3592..bf70febb9 100644 --- a/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesPlugin.cs +++ b/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesPlugin.cs @@ -59,9 +59,11 @@ namespace CodeTemplatesPlugin var ta = MainForm.CurrentSyntaxEditor.TextEditor.ActiveTextAreaControl.TextArea; if (firstTime) { - MainForm.ProjectPane = null; + //MainForm.ProjectPane = null; MainForm.AddWindowToDockPanel(ctForm, MainForm.MainDockPanel, ctForm.Dock, DockState.DockLeft, false, MainForm.ProjectPane, -1); - MainForm.ProjectPane = ctForm.Pane; + ctForm.Hide(); + ctForm.Show(); + //MainForm.ProjectPane = ctForm.Pane; firstTime = false; } else diff --git a/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesPlugin.csproj b/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesPlugin.csproj index 6616c2d10..c7a6d9bb2 100644 --- a/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesPlugin.csproj +++ b/VisualPlugins/CodeTemplatesPlugin/CodeTemplatesPlugin.csproj @@ -12,6 +12,7 @@ v4.7.1 512 true + true @@ -21,6 +22,7 @@ DEBUG;TRACE prompt 4 + false pdbonly @@ -29,6 +31,7 @@ TRACE prompt 4 + false diff --git a/bin/Lib/PABCSystem.pas b/bin/Lib/PABCSystem.pas index 3d0c1c010..7c1dbc897 100644 --- a/bin/Lib/PABCSystem.pas +++ b/bin/Lib/PABCSystem.pas @@ -9413,7 +9413,7 @@ end; /// Π’ΠΎΠ·Π²Ρ€Π°Ρ‰Π°Π΅Ρ‚ индСкс послСднСго минимального элСмСнта function LastIndexMin(Self: array of T): integer; extensionmethod; where T: System.IComparable; begin - Result := Self.LastIndexMin(Self.Count - 1); + Result := Self.LastIndexMin(Self.Length - 1); end; /// Π’ΠΎΠ·Π²Ρ€Π°Ρ‰Π°Π΅Ρ‚ индСкс послСднСго минимального элСмСнта Π² Π΄ΠΈΠ°ΠΏΠ°Π·ΠΎΠ½Π΅ [0,index-1] diff --git a/bin/PascalABCNET.chm b/bin/PascalABCNET.chm index fa00d9ff8..dcf4b1ba8 100644 Binary files a/bin/PascalABCNET.chm and b/bin/PascalABCNET.chm differ