Skip to content

#255 - negative start index when adding attribute code #294

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

Open
CoreySutton wants to merge 4 commits into
base: spkl_dev
Choose a base branch
from
Open

#255 - negative start index when adding attribute code #294

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
73f8ece
Fix negative index and improve attribute code insertion reliability
CoreySutton Jan 15, 2019
dbc1f06
Use type inference
CoreySutton May 7, 2019
a11fee5
Add tests for CodeParser.AddAttribute()
CoreySutton May 7, 2019
1d3577b
Move plugin definition template strings into resx
CoreySutton May 7, 2019
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
36 changes: 26 additions & 10 deletions spkl/SparkleXrm.Tasks/CodeParser.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ public int RemoveExistingAttributes()
return count;
}



public void AddAttribute(CrmPluginRegistrationAttribute attribute, string className)
{
Expand All @@ -169,20 +169,36 @@ public void AddAttribute(CrmPluginRegistrationAttribute attribute, string classN
if (classLocation == null)
throw new Exception(String.Format("Cannot find class {0}", className));

var pos = _code.IndexOf(classLocation.Value);
// start index of "public class OpportunityPluign"
int classStartIndex = _code.IndexOf(classLocation.Value);

// start index of "{ public class OpportunityPluign"
int openBraceBeforeClassIndex = _code.LastIndexOf("{", classStartIndex - 1);

// Find previouse line break
var lineBreak = _code.LastIndexOf("\r\n", pos - 1);
// start index of "<EOL> { public class OpportunityPluign"
int eolBeforeClassIndex = _code.LastIndexOf("\r\n", classStartIndex - 1, classStartIndex - 1 - openBraceBeforeClassIndex);

// Indentation
var indentation = _code.Substring(lineBreak, pos - lineBreak);
// discover indentation between class and EOL (inclusive of EOL character)
string indentation = "\r\n";
if (eolBeforeClassIndex != -1)
{
indentation = _code.Substring(eolBeforeClassIndex, classStartIndex - eolBeforeClassIndex);
}

// Add the attribute
var attributeCode = attribute.GetAttributeCode(indentation);
// generate the attribut code
string attributeCode = attribute.GetAttributeCode(indentation);

// Insert
_code = _code.Insert(lineBreak, attributeCode);
if (eolBeforeClassIndex == -1)
{
// insert attribute code at class start
eolBeforeClassIndex = classStartIndex;

// add EOL between attribute code and class
attributeCode += "\r\n";
}

// insert attribute code
_code = _code.Insert(eolBeforeClassIndex, attributeCode);
}
#endregion
}
Expand Down