Merge pull request #83 from anboralabs/restyled/psi-impl

dalgarins · web-flow · commit 5c9eee059669 · 2021-09-24T23:53:55.000-05:00
Restyle Annotators
diff --git a/src/main/kotlin/co/anbora/labs/firebase/ide/annotator/HighlightingAnnotator.kt b/src/main/kotlin/co/anbora/labs/firebase/ide/annotator/HighlightingAnnotator.kt
@@ -1,4 +1,4 @@
 package co.anbora.labs.firebase.ide.annotator
 
 class HighlightingAnnotator {
-}
+}
diff --git a/src/main/kotlin/co/anbora/labs/firebase/ide/annotator/PathVariableHighlightAnnotator.kt b/src/main/kotlin/co/anbora/labs/firebase/ide/annotator/PathVariableHighlightAnnotator.kt
@@ -35,4 +35,4 @@ class PathVariableHighlightAnnotator : FirebaseAnnotator() {
             }
         }
     }
-}
+}
diff --git a/src/main/kotlin/co/anbora/labs/firebase/ide/editor/FirebaseQuoteHandler.kt b/src/main/kotlin/co/anbora/labs/firebase/ide/editor/FirebaseQuoteHandler.kt
@@ -3,4 +3,4 @@ package co.anbora.labs.firebase.ide.editor
 import co.anbora.labs.firebase.lang.core.psi.FirebaseRulesTypes.STRING
 import com.intellij.codeInsight.editorActions.SimpleTokenSetQuoteHandler
 
-class FirebaseQuoteHandler: SimpleTokenSetQuoteHandler(STRING)
+class FirebaseQuoteHandler: SimpleTokenSetQuoteHandler(STRING)
diff --git a/src/main/kotlin/co/anbora/labs/firebase/ide/inspections/DuplicateFunctionsInspection.kt b/src/main/kotlin/co/anbora/labs/firebase/ide/inspections/DuplicateFunctionsInspection.kt
@@ -46,4 +46,4 @@ private fun checkPathVariable(element: FirebaseRulesFullPathStatement, holder: P
 
 private fun markDuplicate(element: FirebaseElement, holder: ProblemsHolder) {
     holder.registerProblem(element, "Duplicate definitions with name `${element.text}`", ProblemHighlightType.ERROR)
-}
+}
diff --git a/src/main/kotlin/co/anbora/labs/firebase/ide/inspections/WeakRulesInspection.kt b/src/main/kotlin/co/anbora/labs/firebase/ide/inspections/WeakRulesInspection.kt
@@ -30,4 +30,4 @@ private fun checkWeakRule(element: FirebaseRulesConditionalBlock, holder: Proble
     if (booleanStm?.text == FIREBASE_TRUE) {
         holder.registerProblem(booleanStm, "Weak rule, this is not recommended for production environments.", ProblemHighlightType.WEAK_WARNING)
     }
-}
+}
diff --git a/src/main/kotlin/co/anbora/labs/firebase/lang/core/psi/FirebaseNameIdentifierOwner.kt b/src/main/kotlin/co/anbora/labs/firebase/lang/core/psi/FirebaseNameIdentifierOwner.kt
@@ -3,4 +3,4 @@ package co.anbora.labs.firebase.lang.core.psi
 import com.intellij.psi.PsiNameIdentifierOwner
 
 interface FirebaseNameIdentifierOwner : FirebaseNamedElement,
-                                    PsiNameIdentifierOwner
+                                    PsiNameIdentifierOwner
diff --git a/src/main/kotlin/co/anbora/labs/firebase/lang/core/psi/FirebaseNamedElement.kt b/src/main/kotlin/co/anbora/labs/firebase/lang/core/psi/FirebaseNamedElement.kt
@@ -12,4 +12,4 @@ interface FirebaseNamedElement : FirebaseElement,
 
     val nameElement: PsiElement?
         get() = findLastChildByType(IDENTIFIER)
-}
+}
diff --git a/src/main/kotlin/co/anbora/labs/firebase/lang/core/psi/ext/PsiElement.kt b/src/main/kotlin/co/anbora/labs/firebase/lang/core/psi/ext/PsiElement.kt
@@ -14,4 +14,4 @@ fun PsiElement.childrenByType(type: IElementType): Sequence<PsiElement> =
     childrenWithLeaves.filter { it.elementType == type }
 
 fun PsiElement.findLastChildByType(type: IElementType): PsiElement? =
-    childrenByType(type).lastOrNull()
+    childrenByType(type).lastOrNull()
diff --git a/src/main/kotlin/co/anbora/labs/firebase/lang/core/psi/impl/FirebaseNameIdentifierOwnerImpl.kt b/src/main/kotlin/co/anbora/labs/firebase/lang/core/psi/impl/FirebaseNameIdentifierOwnerImpl.kt
@@ -8,4 +8,4 @@ abstract class FirebaseNameIdentifierOwnerImpl(
     node: ASTNode
 ) : FirebaseNamedElementImpl(node), FirebaseNameIdentifierOwner {
     override fun getNameIdentifier(): PsiElement? = nameElement
-}
+}
diff --git a/src/main/kotlin/co/anbora/labs/firebase/lang/core/psi/impl/FirebaseNamedElementImpl.kt b/src/main/kotlin/co/anbora/labs/firebase/lang/core/psi/impl/FirebaseNamedElementImpl.kt
@@ -18,4 +18,4 @@ abstract class FirebaseNamedElementImpl(
     override fun getNavigationElement(): PsiElement = nameElement ?: this
 
     override fun getTextOffset(): Int = nameElement?.textOffset ?: super.getTextOffset()
-}
+}
diff --git a/src/main/kotlin/co/anbora/labs/firebase/lang/core/psi/mixings/IdentifierMixing.kt b/src/main/kotlin/co/anbora/labs/firebase/lang/core/psi/mixings/IdentifierMixing.kt
@@ -5,4 +5,4 @@ import co.anbora.labs.firebase.lang.core.psi.impl.FirebaseNameIdentifierOwnerImp
 import com.intellij.lang.ASTNode
 
 abstract class IdentifierMixing(node: ASTNode): FirebaseNameIdentifierOwnerImpl(node), FirebaseRulesIdentifierExpr {
-}
+}
diff --git a/src/main/resources/inspectionDescriptions/DuplicateFunctionsDeclaration.html b/src/main/resources/inspectionDescriptions/DuplicateFunctionsDeclaration.html
@@ -2,4 +2,4 @@
     <body>
         Multiple functions has the same name and arguments.
     </body>
-</html>
+</html>
diff --git a/src/main/resources/inspectionDescriptions/FirebaseWeakRules.html b/src/main/resources/inspectionDescriptions/FirebaseWeakRules.html
@@ -4,4 +4,4 @@
 
         See https://firebase.google.com/docs/rules/rules-behavior.
     </body>
-</html>
+</html>

-Original file line number
+Diff line change
@@ @@ -1,4 +1,4 @@ @@
 package co.anbora.labs.firebase.ide.annotator
 class HighlightingAnnotator {
 -}
 +}
Original file line number	Diff line number	Diff line change
`@@ -35,4 +35,4 @@ class PathVariableHighlightAnnotator : FirebaseAnnotator() {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`
`38`		`-}`
	`38`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -30,4 +30,4 @@ private fun checkWeakRule(element: FirebaseRulesConditionalBlock, holder: Proble`
`30`	`30`	`if (booleanStm?.text == FIREBASE_TRUE) {`
`31`	`31`	`holder.registerProblem(booleanStm, "Weak rule, this is not recommended for production environments.", ProblemHighlightType.WEAK_WARNING)`
`32`	`32`	`}`
`33`		`-}`
	`33`	`+}`