administrator/pascalabcnet
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

AutoInsertCode.cs изменения

Browse source
This commit is contained in:
Mikhalkovich Stanislav 2019-07-24 15:45:12 +03:00
parent c6b2efb398
commit f88e438d25
4 changed files with 8 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Configuration/GlobalAssemblyInfo.cs
View file

@ -15,7 +15,7 @@ internal static class RevisionClass
public const string Major = "3";
public const string Minor = "5";
public const string Build = "0";
public const string Revision = "2199";
public const string Revision = "2202";
public const string MainVersion = Major + "." + Minor;
public const string FullVersion = Major + "." + Minor + "." + Build + "." + Revision;

4
Configuration/Version.defs
View file

@ -1,4 +1,4 @@
%MINOR%=5
%REVISION%=2199
%COREVERSION%=0
%REVISION%=2202
%MINOR%=5
%MAJOR%=3

2
ReleaseGenerators/PascalABCNET_version.nsh
View file

@ -1 +1 @@
!define VERSION '3.5.0.2199'
!define VERSION '3.5.0.2202'

20
VisualPascalABCNET/AutoInsertCode/AutoInsertCode.cs
View file

@ -70,7 +70,7 @@ namespace VisualPascalABC
int start1 = TextUtilities.FindPrevWordStart(editor.Document, caret1.Offset);
var Text1 = editor.Document.GetText(start1, caret1.Offset - start1).TrimEnd();
if (Text1.ToLower().StartsWith("for"))
if (Text1.ToLower().StartsWith("for") || Text1.ToLower().StartsWith("foreach"))
{
doc.Insert(CurrentOffset(), " var");
ta.Caret.Column = ta.Caret.Column + 5;
@ -83,20 +83,6 @@ namespace VisualPascalABC
int offset = doc.PositionToOffset(tl_beg);
doc.Insert(offset, ")");
return false;
}
if (ch == '[')
{
var tl_beg = new TextLocation(ta.Caret.Column, ta.Caret.Line);
int offset = doc.PositionToOffset(tl_beg);
doc.Insert(offset, "]");
return false;
}
if (ch == '{')
{
var tl_beg = new TextLocation(ta.Caret.Column, ta.Caret.Line);
int offset = doc.PositionToOffset(tl_beg);
doc.Insert(offset, "}");
return false;
}*/
if (ch != '\n')
return false;
@ -186,7 +172,9 @@ namespace VisualPascalABC
var curline = doc.GetText(seg);
if (curline.Contains(":="))
{
var curlinenew = Regex.Replace(curline, @"(\s*)(\S+)(\s*):=(\s*)(.+)(;?)(\s*)", @"$1$2 := $5;");
var curlinenew = Regex.Replace(curline, @"(\s*)(\S+)(\s*):=(\s*)([^;]+)(;?)(\s*)", @"$1$2 := $5;");
//if (curlinenew.EndsWith(";;"))
// curlinenew = curlinenew.Remove(curlinenew.Length - 1);
doc.Replace(seg.Offset, curline.Length, curlinenew);
ta.Caret.Column = curlinenew.Length;
return false;