Skip to content

Fixed Issue #1, Duplicate Code for t and vr. #4

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
jayharris wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Fixed Issue #1, Duplicate Code for t and vr. #4

Show file tree
Hide file tree
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
34 changes: 19 additions & 15 deletions src/Mnemonics/CSharp.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,24 @@ let cSharpStructureTemplates =
)
]

let cSharpUntypedMemberTemplates =
[
(
"tm",
[
Text "A test method."
],
[
Text "[Test] public void "
Constant ("methodname", "MyMethod")
Text "()"
Scope [
endConstant
]
]
)
]

let cSharpMemberTemplates =
[
(
Expand All @@ -107,7 +125,7 @@ let cSharpMemberTemplates =
],
[
Text "private readonly "
Constant ("type", "type")
FixedType
Text " "
Constant ("fieldname", "fieldname")
semiColon
Expand Down Expand Up @@ -161,20 +179,6 @@ let cSharpMemberTemplates =
semiColon
]
)
(
"t",
[
Text "A test method."
],
[
Text "[Test] public void "
Constant ("methodname", "MyMethod")
Text "()"
Scope [
endConstant
]
]
)
(
"m",
[
Expand Down
25 changes: 25 additions & 0 deletions src/Mnemonics/Program.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,19 @@ let renderReSharper() =

// now process members
if renderCSharp then
for (s,doc,exprs) in cSharpUntypedMemberTemplates do
let t = new TemplatesExportTemplate(shortcut=s)
let vars = new List<TemplatesExportTemplateVariable>()
t.description <- printExpressions doc vars String.Empty
t.reformat <- "True"
t.uid <- newGuid()
t.text <- printExpressions exprs vars String.Empty

t.Context <- new TemplatesExportTemplateContext(CSharpContext = csContext)
t.Variables <- vars.ToArray()
templates.Add t
done

for (s,doc,exprs) in cSharpMemberTemplates do
// simple types; methods can be void
let types = (if Char.ToLower(s.Chars(0)) ='m' then ("", "void", "") :: csharpTypes else csharpTypes)
Expand Down Expand Up @@ -166,6 +179,18 @@ let renderReSharper() =
done

if renderVBNET then
for (s,doc,exprs) in vbUntypedMemberTemplates do
let t = new TemplatesExportTemplate(shortcut=s)
let vars = new List<TemplatesExportTemplateVariable>()
t.description <- printExpressions doc vars String.Empty
t.reformat <- "False" // critical difference with C#!!!
t.uid <- newGuid()
t.text <- printExpressions exprs vars String.Empty
t.Context <- new TemplatesExportTemplateContext(VBContext = vbContext)
t.Variables <- vars.ToArray()
templates.Add t
done

for (s,doc,exprs) in vbMemberTemplates do
// simple types; methods can be void
for (tk,tv,defValue) in vbTypes do
Expand Down
26 changes: 15 additions & 11 deletions src/Mnemonics/VB.NET.fs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,21 @@ let vbStructureTemplates =
)
]

let vbUntypedMemberTemplates =
[
(
"tm",
[
Text "A test method."
],
[
Text "<Test> Public Sub "
Constant ("methodname", "SomeMethod")
Text "()"
]
)
]

let vbMemberTemplates =
[
(
Expand Down Expand Up @@ -144,17 +159,6 @@ let vbMemberTemplates =
DefaultValue
]
)
(
"t",
[
Text "A test method."
],
[
Text "<Test> Public Sub "
Constant ("methodname", "SomeMethod")
Text "()"
]
)
(
"m",
[
Expand Down