Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
J
jetbrains-plugin
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
JastAdd
jetbrains-plugin
Commits
e08f3f40
Commit
e08f3f40
authored
3 years ago
by
Johannes Mey
Browse files
Options
Downloads
Patches
Plain Diff
autoformatter now formats top-level elements in aspect correctly
parent
32d35778
No related branches found
No related tags found
1 merge request
!2
Feature/autoformat
Pipeline
#11895
canceled
3 years ago
Stage: jar
Changes
1
Pipelines
2
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/main/java/org/jastadd/tooling/aspect/AspectBlock.java
+2
-6
2 additions, 6 deletions
src/main/java/org/jastadd/tooling/aspect/AspectBlock.java
with
2 additions
and
6 deletions
src/main/java/org/jastadd/tooling/aspect/AspectBlock.java
+
2
−
6
View file @
e08f3f40
...
@@ -9,9 +9,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings;
...
@@ -9,9 +9,7 @@ import com.intellij.psi.codeStyle.CodeStyleSettings;
import
com.intellij.psi.formatter.common.AbstractBlock
;
import
com.intellij.psi.formatter.common.AbstractBlock
;
import
com.intellij.psi.formatter.common.InjectedLanguageBlockBuilder
;
import
com.intellij.psi.formatter.common.InjectedLanguageBlockBuilder
;
import
com.intellij.psi.formatter.java.LeafBlock
;
import
com.intellij.psi.formatter.java.LeafBlock
;
import
org.jastadd.tooling.aspect.psi.JastAddAspectAspectBody
;
import
org.jastadd.tooling.aspect.psi.*
;
import
org.jastadd.tooling.aspect.psi.JastAddAspectAspectBodyDeclaration
;
import
org.jastadd.tooling.aspect.psi.JastAddAspectBlock
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.NotNull
;
import
org.jetbrains.annotations.Nullable
;
import
org.jetbrains.annotations.Nullable
;
...
@@ -52,10 +50,8 @@ public class AspectBlock extends AbstractBlock {
...
@@ -52,10 +50,8 @@ public class AspectBlock extends AbstractBlock {
@Override
@Override
public
Indent
getIndent
()
{
public
Indent
getIndent
()
{
if
(
myNode
.
get
Psi
()
instanceof
JastAddAspectAspectBodyDeclaration
)
{
if
(
myNode
.
get
TreeParent
()
!=
null
&&
myNode
.
getTreeParent
().
getPsi
()
instanceof
JastAddAspectAspectBody
&&
myNode
.
getElementType
()
!=
AspectTypes
.
RBRACE
)
{
return
Indent
.
getNormalIndent
();
return
Indent
.
getNormalIndent
();
}
else
if
(
myNode
.
getPsi
()
instanceof
JastAddAspectAspectBody
)
{
return
Indent
.
getAbsoluteNoneIndent
();
}
else
{
}
else
{
return
Indent
.
getNoneIndent
();
return
Indent
.
getNoneIndent
();
}
}
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment