CodeTemplatesPlugin.cs - небольшие правки

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;

Configuration/Version.defs

@@ -1,4 +1,4 @@
-%COREVERSION%=1
-%REVISION%=2250
 %MINOR%=5
+%REVISION%=2251
+%COREVERSION%=1
 %MAJOR%=3

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);

PABCNetHelp/LangGuide/Operations_Expressions/oppriority.html

@@ -17,6 +17,10 @@
 		</td>
 		<td width="110">1 (íŕčâűńřčé)</td>
 	</tr>
+	<tr>
+		<td><code>**</code></td>
+		<td width="110">2</td>
+	</tr>
 	<tr>
 		<td><code>*</code>,
 		<code>/</code>,
@@ -27,14 +31,14 @@
 		<code><b>shr</b></code>,
 		<code><b>as</b></code>,
 		<code><b>is</b></code></td>
-		<td width="110">2</td>
+		<td width="110">3</td>
 	</tr>
 	<tr>
 		<td><code>+</code>,
 		<code>-</code> (áčíŕđíűĺ),
 		<code><b>or</b></code>,
 		<code><b>xor</b></code> </td>
-		<td width="110">3</td>
+		<td width="110">4</td>
 	</tr>
 	<tr>
 		<td><code>=</code>,
@@ -44,11 +48,11 @@
 		<code>&lt;=</code>,
 		<code>&gt;=</code>,
 		<code><b>in</b></code></td>
-		<td width="110">4</td>
+		<td width="110">5</td>
 	</tr>
 	<tr>
 		<td><code>?: </code>&nbsp;</td>
-		<td width="110">5 (íèçøèé)</td>
+		<td width="110">6 (íèçøèé)</td>
 	</tr>
 </table>
 

Release/pabcversion.txt

@@ -1 +1 @@
-3.5.1.2250
+3.5.1.2251

ReleaseGenerators/PascalABCNET_version.nsh

@@ -1 +1 @@
-!define VERSION '3.5.1.2250'
+!define VERSION '3.5.1.2251'

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)
                     {

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

VisualPlugins/CodeTemplatesPlugin/CodeTemplatesPlugin.csproj

@@ -12,6 +12,7 @@
     <TargetFrameworkVersion>v4.7.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -21,6 +22,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
@@ -29,6 +31,7 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="AvalonDock, Version=1.3.3585.0, Culture=neutral, PublicKeyToken=f829da5c02be14ee" />

bin/Lib/PABCSystem.pas

@@ -9413,7 +9413,7 @@ end;
 /// Возвращает индекс последнего минимального элемента
 function LastIndexMin<T>(Self: array of T): integer; extensionmethod; where T: System.IComparable<T>;
 begin
-  Result := Self.LastIndexMin(Self.Count - 1);
+  Result := Self.LastIndexMin(Self.Length - 1);
 end;  
 
 /// Возвращает индекс последнего минимального элемента в диапазоне [0,index-1]