Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Exception from Header when cleaning up all code #912

Open
wants to merge 1 commit into
base: dev
Choose a base branch
from
Open

Fix Exception from Header when cleaning up all code #912

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
140 changes: 79 additions & 61 deletions CodeMaidShared/Logic/Cleaning/FileHeaderLogic.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,20 +93,23 @@ private int GetHeaderLength(TextDocument textDocument, bool skipUsings)

private string GetCurrentHeader(TextDocument textDocument, bool skipUsings)
{
Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
UIThread.Run(() =>
{
ThreadHelper.ThrowIfNotOnUIThread();

var currentHeaderLength = GetHeaderLength(textDocument, skipUsings);
var currentHeaderLength = GetHeaderLength(textDocument, skipUsings);

var headerBlockStart = textDocument.StartPoint.CreateEditPoint();
var headerBlockStart = textDocument.StartPoint.CreateEditPoint();

if (skipUsings)
{
var nbLinesToSkip = GetNbLinesToSkip(textDocument);
if (skipUsings)
{
var nbLinesToSkip = GetNbLinesToSkip(textDocument);

headerBlockStart.MoveToLineAndOffset(nbLinesToSkip + 1, 1);
}
headerBlockStart.MoveToLineAndOffset(nbLinesToSkip + 1, 1);
}

return headerBlockStart.GetText(currentHeaderLength + 1).Trim();
return headerBlockStart.GetText(currentHeaderLength + 1).Trim();
});
}

private int GetNbLinesToSkip(TextDocument textDocument)
Expand Down Expand Up @@ -141,39 +144,45 @@ private void InsertFileHeader(TextDocument textDocument, string settingsFileHead
/// <remarks>Only valid for languages containing "using" directive</remarks>
private void InsertFileHeaderAfterUsings(TextDocument textDocument, string settingsFileHeader)
{
Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
UIThread.Run(() =>
{
ThreadHelper.ThrowIfNotOnUIThread();

var currentHeader = GetCurrentHeader(textDocument, true).Trim();
var currentHeader = GetCurrentHeader(textDocument, true).Trim();

if (currentHeader.StartsWith(settingsFileHeader.Trim()))
{
return;
}
if (currentHeader.StartsWith(settingsFileHeader.Trim()))
{
return;
}

var headerBlockStart = textDocument.StartPoint.CreateEditPoint();
var nbLinesToSkip = GetNbLinesToSkip(textDocument);
var headerBlockStart = textDocument.StartPoint.CreateEditPoint();
var nbLinesToSkip = GetNbLinesToSkip(textDocument);

headerBlockStart.MoveToLineAndOffset(nbLinesToSkip + 1, 1);
headerBlockStart.MoveToLineAndOffset(nbLinesToSkip + 1, 1);

if (!settingsFileHeader.StartsWith(Environment.NewLine))
{
settingsFileHeader = Environment.NewLine + settingsFileHeader;
}
if (!settingsFileHeader.StartsWith(Environment.NewLine))
{
settingsFileHeader = Environment.NewLine + settingsFileHeader;
}

headerBlockStart.Insert(settingsFileHeader);
headerBlockStart.Insert(settingsFileHeader);
});
}

private void InsertFileHeaderDocumentStart(TextDocument textDocument, string settingsFileHeader)
{
Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
UIThread.Run(() =>
{
ThreadHelper.ThrowIfNotOnUIThread();

var cursor = textDocument.StartPoint.CreateEditPoint();
var existingFileHeader = cursor.GetText(settingsFileHeader.Length);
var cursor = textDocument.StartPoint.CreateEditPoint();
var existingFileHeader = cursor.GetText(settingsFileHeader.Length);

if (!existingFileHeader.StartsWith(settingsFileHeader.Trim()))
{
cursor.Insert(settingsFileHeader);
}
if (!existingFileHeader.StartsWith(settingsFileHeader.Trim()))
{
cursor.Insert(settingsFileHeader);
}
});
}

/// <summary>
Expand All @@ -183,12 +192,15 @@ private void InsertFileHeaderDocumentStart(TextDocument textDocument, string set
/// <returns>A string representing the first <see cref="HeaderMaxNbLines"/> lines of the document</returns>
private string ReadTextBlock(TextDocument textDocument)
{
Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
UIThread.Run(() =>
{
ThreadHelper.ThrowIfNotOnUIThread();

var maxNbLines = Math.Min(HeaderMaxNbLines, textDocument.EndPoint.Line);
var blockStart = textDocument.StartPoint.CreateEditPoint();
var maxNbLines = Math.Min(HeaderMaxNbLines, textDocument.EndPoint.Line);
var blockStart = textDocument.StartPoint.CreateEditPoint();

return blockStart.GetLines(1, maxNbLines);
return blockStart.GetLines(1, maxNbLines);
});
}

private void ReplaceFileHeader(TextDocument textDocument, string settingsFileHeader)
Expand Down Expand Up @@ -218,49 +230,55 @@ private void ReplaceFileHeader(TextDocument textDocument, string settingsFileHea
/// <remarks>Only valid for languages containing "using" directive</remarks>
private void ReplaceFileHeaderAfterUsings(TextDocument textDocument, string settingsFileHeader)
{
Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
UIThread.Run(() =>
{
ThreadHelper.ThrowIfNotOnUIThread();

var currentHeader = GetCurrentHeader(textDocument, true).Trim();
var newHeader = settingsFileHeader.Trim();
var currentHeader = GetCurrentHeader(textDocument, true).Trim();
var newHeader = settingsFileHeader.Trim();

if (string.Equals(currentHeader, newHeader))
{
return;
}
if (string.Equals(currentHeader, newHeader))
{
return;
}

var headerBlockStart = textDocument.StartPoint.CreateEditPoint();
var nbLinesToSkip = GetNbLinesToSkip(textDocument);
var headerBlockStart = textDocument.StartPoint.CreateEditPoint();
var nbLinesToSkip = GetNbLinesToSkip(textDocument);

headerBlockStart.MoveToLineAndOffset(nbLinesToSkip + 1, 1);
headerBlockStart.MoveToLineAndOffset(nbLinesToSkip + 1, 1);

var currentHeaderLength = GetHeaderLength(textDocument, true);
var currentHeaderLength = GetHeaderLength(textDocument, true);

if (!settingsFileHeader.StartsWith(Environment.NewLine))
{
settingsFileHeader = Environment.NewLine + settingsFileHeader;
}
if (!settingsFileHeader.StartsWith(Environment.NewLine))
{
settingsFileHeader = Environment.NewLine + settingsFileHeader;
}

headerBlockStart.ReplaceText(currentHeaderLength, settingsFileHeader, (int)vsEPReplaceTextOptions.vsEPReplaceTextKeepMarkers);
headerBlockStart.ReplaceText(currentHeaderLength, settingsFileHeader, (int)vsEPReplaceTextOptions.vsEPReplaceTextKeepMarkers);
});
}

private void ReplaceFileHeaderDocumentStart(TextDocument textDocument, string settingsFileHeader)
{
Microsoft.VisualStudio.Shell.ThreadHelper.ThrowIfNotOnUIThread();
UIThread.Run(() =>
{
ThreadHelper.ThrowIfNotOnUIThread();

var currentHeader = GetCurrentHeader(textDocument, false).Trim();
var newHeader = settingsFileHeader.Trim();
var currentHeader = GetCurrentHeader(textDocument, false).Trim();
var newHeader = settingsFileHeader.Trim();

if (string.Equals(currentHeader, newHeader))
{
return;
}
if (string.Equals(currentHeader, newHeader))
{
return;
}

var headerBlockStart = textDocument.StartPoint.CreateEditPoint();
var currentHeaderLength = GetHeaderLength(textDocument, false);
var headerBlockStart = textDocument.StartPoint.CreateEditPoint();
var currentHeaderLength = GetHeaderLength(textDocument, false);

headerBlockStart.ReplaceText(currentHeaderLength, settingsFileHeader, (int)vsEPReplaceTextOptions.vsEPReplaceTextKeepMarkers);
headerBlockStart.ReplaceText(currentHeaderLength, settingsFileHeader, (int)vsEPReplaceTextOptions.vsEPReplaceTextKeepMarkers);
});
}

#endregion Methods
}
}
}