ICSharpCode
/
WpfDesigner
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Fix Position not correct for big Xaml Files

This commit is contained in:
jogibear9988 2016-02-04 09:02:42 +01:00
Родитель 46e1333e70
Коммит 1788fe871a
1 изменённых файлов: 40 добавлений и 16 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

56
WpfDesign.XamlDom/Project/PositionXmlDocument.cs
Просмотреть файл

@ -19,6 +19,7 @@
using System; using System;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Reflection; using System.Reflection;
using System.Text;
using System.Windows.Controls; using System.Windows.Controls;
using System.Xml; using System.Xml;
@ -68,6 +69,7 @@ namespace ICSharpCode.WpfDesign.XamlDom
} }
internal XmlWriter oldWriter; internal XmlWriter oldWriter;
internal StringBuilder writerSb;
internal Func<char[]> bufGetter; internal Func<char[]> bufGetter;
internal Func<int> contentPosFieldGetter; internal Func<int> contentPosFieldGetter;
internal Func<int> buffPosGetter; internal Func<int> buffPosGetter;
@ -152,6 +154,13 @@ namespace ICSharpCode.WpfDesign.XamlDom
.GetField("contentPos", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public); .GetField("contentPos", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
var buffPosField = rawTextW.GetType() var buffPosField = rawTextW.GetType()
.GetField("bufPos", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public); .GetField("bufPos", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
var ioTextWriterField = rawTextW.GetType()
.GetField("writer", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
var ioTextWriter = ioTextWriterField.GetValue(rawTextW);
var sbField = ioTextWriter.GetType()
.GetField("_sb", BindingFlags.Instance | BindingFlags.NonPublic | BindingFlags.Public);
positionXmlDocument.writerSb = sbField.GetValue(ioTextWriter) as StringBuilder;
positionXmlDocument.bufGetter = positionXmlDocument.bufGetter =
Expression.Lambda<Func<char[]>>(Expression.Field(Expression.Constant(rawTextW), bufCharsField)).Compile(); Expression.Lambda<Func<char[]>>(Expression.Field(Expression.Constant(rawTextW), bufCharsField)).Compile();
positionXmlDocument.contentPosFieldGetter = positionXmlDocument.contentPosFieldGetter =
@ -163,32 +172,47 @@ namespace ICSharpCode.WpfDesign.XamlDom
{ } { }
} }
if (positionXmlDocument.bufGetter != null && positionXmlDocument.buffPosGetter != null) if (positionXmlDocument.bufGetter != null && positionXmlDocument.buffPosGetter != null &&
positionXmlDocument.writerSb != null)
{ {
var buff = positionXmlDocument.bufGetter(); try
var pos = positionXmlDocument.buffPosGetter();
for (int n = pos; n >= positionXmlDocument.lastCharacterPos; n--)
{ {
if (buff[n] == '\n') var buff = positionXmlDocument.bufGetter();
var pos = positionXmlDocument.buffPosGetter();
for (int n = pos; n >= positionXmlDocument.lastCharacterPos; n--)
{ {
positionXmlDocument.lineCnt++; if (buff[n] == '\n')
{
positionXmlDocument.lineCnt++;
}
} }
this.xamlElementLineInfo = new XamlElementLineInfo(positionXmlDocument.lineCnt + 1,
pos + 1 + positionXmlDocument.writerSb.Length);
if (buff[pos - 1] != '>')
this.xamlElementLineInfo.LinePosition++;
this.xamlElementLineInfo.Position = pos + positionXmlDocument.writerSb.Length;
}
catch (Exception)
{
} }
this.xamlElementLineInfo = new XamlElementLineInfo(positionXmlDocument.lineCnt + 1, pos + 1);
if (buff[pos-1] != '>')
this.xamlElementLineInfo.LinePosition++;
this.xamlElementLineInfo.Position = pos;
} }
base.WriteTo(w); base.WriteTo(w);
if (positionXmlDocument.bufGetter != null && positionXmlDocument.buffPosGetter != null) if (positionXmlDocument.bufGetter != null && positionXmlDocument.buffPosGetter != null &&
positionXmlDocument.writerSb != null)
{ {
var pos = positionXmlDocument.buffPosGetter(); try
this.xamlElementLineInfo.Length = pos - this.xamlElementLineInfo.Position; {
var pos = positionXmlDocument.buffPosGetter();
this.xamlElementLineInfo.Length = pos + positionXmlDocument.writerSb.Length - this.xamlElementLineInfo.Position;
}
catch (Exception)
{
}
} }
} }
} }