Skip to content

usability improvements for new features #1784

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

Merged
merged 1 commit into from
Mar 25, 2022
Merged

usability improvements for new features #1784

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
9 changes: 5 additions & 4 deletions ...ava/fr/adrienbrault/idea/symfony2plugin/templating/TwigTemplateCompletionContributor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,16 +579,17 @@ public void addCompletions(@NotNull CompletionParameters parameters,
@NotNull ProcessingContext context,
@NotNull CompletionResultSet resultSet) {

if(!Symfony2ProjectComponent.isEnabled(parameters.getPosition())) {
PsiElement psiElement = parameters.getPosition();
if(!Symfony2ProjectComponent.isEnabled(psiElement)) {
return;
}

List<String> prioritizedKeys = new ArrayList<>();
Project project = parameters.getPosition().getProject();
Project project = psiElement.getProject();

if (TwigPattern.getTemplateFileReferenceTagPattern("extends").accepts(parameters.getPosition())) {
if (TwigPattern.getTemplateFileReferenceTagPattern("extends").accepts(psiElement)) {
prioritizedKeys.addAll(TwigUtil.getExtendsTemplateUsageAsOrderedList(project, 50));
} else if(TwigPattern.getTemplateFileReferenceTagPattern("include").accepts(parameters.getPosition())) {
} else if (TwigPattern.getTemplateFileReferenceTagPattern("include").accepts(psiElement) || TwigPattern.getPrintBlockOrTagFunctionPattern("include", "source").accepts(psiElement)) {
prioritizedKeys.addAll(TwigUtil.getIncludeTemplateUsageAsOrderedList(project, 50));
}

Expand Down
8 changes: 7 additions & 1 deletion ...va/fr/adrienbrault/idea/symfony2plugin/templating/action/TwigBlockOverwriteGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,11 +86,17 @@ public void invoke(@NotNull Project project, @NotNull Editor editor, @NotNull Ps
WriteCommandAction.writeCommandAction(editor.getProject())
.withName("Block Overwrite: " + titleBlocks)
.run((ThrowableRunnable<Throwable>) () -> {
String endBlock = "{% endblock %}";

String content = strings.stream()
.map((Function<String, String>) s -> "{% block " + s + " %}{% endblock %}")
.map((Function<String, String>) s -> "{% block " + s + " %}" + endBlock)
.collect(Collectors.joining("\n"));

PhpInsertHandlerUtil.insertStringAtCaret(editor, content);

// move caret inside block
// {% block %}<caret>{% endblock %}
editor.getCaretModel().moveCaretRelatively(-endBlock.length(), 0, false, false, true);
});
} catch (Throwable ignored) {
}
Expand Down
4 changes: 2 additions & 2 deletions src/main/resources/META-INF/plugin.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,14 +721,14 @@
<action icon="SymfonyIcons.TwigBlockOverwrite"
id="SymfonyTwigBlockOverwrite"
class="fr.adrienbrault.idea.symfony2plugin.templating.action.TwigBlockOverwriteGenerator"
text="Block Overwrite">
text="Twig: Block Overwrite">
<add-to-group group-id="GenerateGroup"/>
</action>

<action icon="TwigIcons.TwigFileIcon"
id="SymfonyTwigExtendsGenerator"
class="fr.adrienbrault.idea.symfony2plugin.templating.action.TwigExtendsGenerator"
text="Extends Tag">
text="Twig: Extends">
<add-to-group group-id="GenerateGroup"/>
</action>

Expand Down