Skip to content

Commit f25b8e5

Browse files
committed
Let trans_default_domain autocomplete put quotes around domain #526; switch single to double quotes and catch both wraps
1 parent aa48722 commit f25b8e5

File tree

2 files changed

+12
-4
lines changed

2 files changed

+12
-4
lines changed

src/fr/adrienbrault/idea/symfony2plugin/templating/completion/QuotedInsertHandler.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@ public static QuotedInsertHandler getInstance(){
2121

2222
@Override
2323
public void handleInsert(InsertionContext context, LookupElement lookupElement) {
24-
if(ResourceFileInsertHandler.isStringBeforeCaret(context.getEditor(), context, "'")) {
24+
if(ResourceFileInsertHandler.isStringBeforeCaret(context.getEditor(), context, "'") ||
25+
ResourceFileInsertHandler.isStringBeforeCaret(context.getEditor(), context, "\""))
26+
{
2527
return;
2628
}
2729

2830
int startOffset = context.getStartOffset();
29-
context.getDocument().insertString(startOffset, "'");
30-
context.getDocument().insertString(startOffset + lookupElement.getLookupString().length() + 1, "'");
31+
context.getDocument().insertString(startOffset, "\"");
32+
context.getDocument().insertString(startOffset + lookupElement.getLookupString().length() + 1, "\"");
3133

3234
// move to end
3335
context.getEditor().getCaretModel().moveCaretRelatively(1, 0, false, false, true);

tests/fr/adrienbrault/idea/symfony2plugin/tests/templating/translation/TwigTranslationCompletionContributorTest.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,19 @@ public void testTransDefaultDomainCompletionShouldQuotedStringValue() {
124124
assertCompletionResultEquals(
125125
TwigFileType.INSTANCE,
126126
"{% trans_default_domain interchang<caret> %}",
127-
"{% trans_default_domain 'interchange' %}"
127+
"{% trans_default_domain \"interchange\" %}"
128128
);
129129

130130
assertCompletionResultEquals(
131131
TwigFileType.INSTANCE,
132132
"{% trans_default_domain 'interchang<caret>' %}",
133133
"{% trans_default_domain 'interchange' %}"
134134
);
135+
136+
assertCompletionResultEquals(
137+
TwigFileType.INSTANCE,
138+
"{% trans_default_domain \"interchang<caret>\" %}",
139+
"{% trans_default_domain \"interchange\" %}"
140+
);
135141
}
136142
}

0 commit comments

Comments
 (0)