Minor code cleanup

48 files changed, 104 insertions, 28 deletions

diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java
index c2dca72daab..01992ef4a5b 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdChooseByNameContributor.java
@@ -18,6 +18,7 @@ import java.util.List;
 
 /**
  * This class is used for the extension (in plugin.xml) to enable "Go To Symbol" feature.
+ *
  * @author Shahar Ariel
  */
 public class SdChooseByNameContributor implements ChooseByNameContributor {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettings.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettings.java
index f4e551acad2..bdf1bf3eb7b 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettings.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettings.java
@@ -6,6 +6,7 @@ import com.intellij.psi.codeStyle.CustomCodeStyleSettings;
 
 /**
  * This class represent a code style settings, and creates an option page in settings/preferences.
+ *
  * @author Shahar Ariel
  */
 public class SdCodeStyleSettings extends CustomCodeStyleSettings {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettingsProvider.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettingsProvider.java
index f3d7a0dcdb4..b02e8371b77 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettingsProvider.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCodeStyleSettingsProvider.java
@@ -13,6 +13,7 @@ import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml) to the class SdCodeStyleSettings.
+ *
  * @author Shahar Ariel
  */
 public class SdCodeStyleSettingsProvider extends CodeStyleSettingsProvider {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCommenter.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCommenter.java
index e63c3e18faf..a8872f71b63 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCommenter.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCommenter.java
@@ -7,6 +7,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * This class is used for the extension (in plugin.xml), to enable turning a line into a comment with 
  * "Code -> Comment with line comment".
+ *
  * @author Shahar Ariel
  */
 public class SdCommenter implements Commenter {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCompletionContributor.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCompletionContributor.java
index 8e060f1d699..3e5b53c87ea 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCompletionContributor.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdCompletionContributor.java
@@ -14,6 +14,7 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * This class is used for the extension (in plugin.xml) to enables Auto-Complete. Partially works for now.
+ *
  * @author Shahar Ariel
  */
 public class SdCompletionContributor extends CompletionContributor {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdFileType.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdFileType.java
index 1ba00d6caa5..b469d0c0ebb 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdFileType.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdFileType.java
@@ -9,6 +9,7 @@ import javax.swing.Icon;
 
 /**
  * This class is used for the extension (in plugin.xml), to define SD as a file's type.
+ *
  * @author Shahar Ariel
  */
 public class SdFileType extends LanguageFileType {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdIcons.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdIcons.java
index 07af6e12355..96f8428b223 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdIcons.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdIcons.java
@@ -7,9 +7,11 @@ import javax.swing.Icon;
 
 /**
  * This class is used for defining Icons for the IDE.
+ *
  * @author Shahar Ariel
  */
 public class SdIcons {
+
     public static final Icon FILE = IconLoader.getIcon("icons/sd_icon.png", SdIcons.class);
     public static final Icon STRUCT_FIELD = IconLoader.getIcon("icons/struct_field_icon.png", SdIcons.class);
     public static final Icon IMPORTED_FIELD = IconLoader.getIcon("icons/imported_field_icon.png", SdIcons.class);
@@ -20,5 +22,6 @@ public class SdIcons {
     public static final Icon MACRO = IconLoader.getIcon("icons/macro_icon.png", SdIcons.class);
     public static final Icon OVERRIDE_MACRO = IconLoader.getIcon("icons/override_macro_icon.png", SdIcons.class);
     public static final Icon FIRST_PHASE = IconLoader.getIcon("icons/first_phase_icon.png", SdIcons.class);
+
 }
     
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdLanguage.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdLanguage.java
index abe82aae5aa..c4d471ee737 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdLanguage.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdLanguage.java
@@ -5,9 +5,11 @@ import com.intellij.lang.Language;
 
 /**
  * This class defines SD as a language.
+ *
  * @author Shahar Ariel
  */
 public class SdLanguage extends Language {
+
     public static final SdLanguage INSTANCE = new SdLanguage();
     
     private SdLanguage() {
@@ -18,4 +20,5 @@ public class SdLanguage extends Language {
     public boolean isCaseSensitive() {
         return true;
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdLanguageCodeStyleSettingsProvider.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdLanguageCodeStyleSettingsProvider.java
index 8b12a4042db..5f618a62d6e 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdLanguageCodeStyleSettingsProvider.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdLanguageCodeStyleSettingsProvider.java
@@ -8,6 +8,7 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * This class is used for the extension (in plugin.xml), to make the IDE use our plugin's code for coding style.
+ *
  * @author Shahar Ariel
  */
 public class SdLanguageCodeStyleSettingsProvider extends LanguageCodeStyleSettingsProvider {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdRefactoringSupportProvider.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdRefactoringSupportProvider.java
index f140a933b0f..24de7bb6253 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdRefactoringSupportProvider.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdRefactoringSupportProvider.java
@@ -9,11 +9,14 @@ import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml), to enable refactoring.
+ *
  * @author Shahar Ariel
  */
 public class SdRefactoringSupportProvider extends RefactoringSupportProvider {
+
     @Override
     public boolean isMemberInplaceRenameAvailable(@NotNull PsiElement elementToRename, @Nullable PsiElement context) {
         return (elementToRename instanceof SdIdentifier);
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdReference.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdReference.java
index c99945b67fb..6404a738e59 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdReference.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdReference.java
@@ -19,7 +19,8 @@ import java.util.ArrayList;
 import java.util.List;
 
 /**
- * This class represent a reference to a Psi Element.
+ * A reference to a Psi Element.
+ *
  * @author Shahar Ariel
  */
 public class SdReference extends PsiReferenceBase<PsiElement> implements PsiPolyVariantReference {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighter.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighter.java
index 86f30e4c06d..df3da81e9fc 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighter.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighter.java
@@ -17,7 +17,8 @@ import org.jetbrains.annotations.NotNull;
 import java.util.HashSet;
 
 /**
- * This class defines the syntax highlighting of an SD file.
+ * Defines the syntax highlighting of an SD file.
+ *
  * @author Shahar Ariel
  */
 public class SdSyntaxHighlighter extends SyntaxHighlighterBase {
@@ -204,8 +205,8 @@ public class SdSyntaxHighlighter extends SyntaxHighlighterBase {
         constants.add(SdTypes.LOCALE);
         constants.add(SdTypes.CREATE_IF_NONEXISTENT);
         constants.add(SdTypes.REMOVE_IF_ZERO);
-    
         return constants;
     }
+
 }
 
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighterFactory.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighterFactory.java
index 997322e362a..6cf30ecb54e 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighterFactory.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdSyntaxHighlighterFactory.java
@@ -9,6 +9,7 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * This class is used for the extension (in plugin.xml) to the class SdSyntaxHighlighter.
+ *
  * @author Shahar Ariel
  */
 public class SdSyntaxHighlighterFactory extends SyntaxHighlighterFactory {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdUtil.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdUtil.java
index 5a45460cf07..f3f949d645f 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdUtil.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/SdUtil.java
@@ -38,7 +38,8 @@ import java.util.HashMap;
 import java.util.List;
 
 /**
- * This is the util class for the plugin's code.
+ * Util class for the plugin's code.
+ *
  * @author Shahar Ariel
  */
 public class SdUtil {
@@ -217,5 +218,4 @@ public class SdUtil {
         return new ArrayList<>(PsiTreeUtil.collectElementsOfType(element, SdSummaryDefinition.class));
     }
     
-    
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java
index 7e7f038593a..ab463562355 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRule.java
@@ -14,7 +14,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * This class represent a Document Summary that groups elements in the "Find Usages" window.
+ * A Document Summary that groups elements in the "Find Usages" window.
+ *
  * @author Shahar Ariel
  */
 public class SdDocumentSummaryGroupingRule extends SingleParentUsageGroupingRule implements DumbAware {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRuleProvider.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRuleProvider.java
index fd711949b50..76b82d7c857 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRuleProvider.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdDocumentSummaryGroupingRuleProvider.java
@@ -9,6 +9,7 @@ import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml) to the class SdDocumentSummaryGroupingRule.
+ *
  * @author Shahar Ariel
  */
 public class SdDocumentSummaryGroupingRuleProvider implements FileStructureGroupRuleProvider {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java
index d7fb8106904..4609f2e7fbb 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandler.java
@@ -23,6 +23,7 @@ import java.util.List;
 
 /**
  * This class handles creating the "Find Usages" window.
+ *
  * @author Shahar Ariel
  */
 public class SdFindUsagesHandler extends FindUsagesHandler {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandlerFactory.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandlerFactory.java
index 125c406062a..98be15778e7 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandlerFactory.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesHandlerFactory.java
@@ -10,6 +10,7 @@ import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml) to the class SdFindUsagesHandler.
+ *
  * @author Shahar Ariel
  */
 public class SdFindUsagesHandlerFactory extends FindUsagesHandlerFactory {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesProvider.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesProvider.java
index b786ceebed7..a86fb2b058b 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesProvider.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdFindUsagesProvider.java
@@ -18,9 +18,11 @@ import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml), to enable "find Usages" window using the plugin code.
+ *
  * @author Shahar Ariel
  */
 public class SdFindUsagesProvider implements FindUsagesProvider {
+
     @Nullable
     @Override
     public WordsScanner getWordsScanner() {
@@ -71,4 +73,5 @@ public class SdFindUsagesProvider implements FindUsagesProvider {
             return "";
         }
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRule.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRule.java
index 71111618098..fd3073b6016 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRule.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRule.java
@@ -14,7 +14,8 @@ import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 /**
- * This class represent a Rank Profile that groups elements in the "Find Usages" window.
+ * A Rank Profile that groups elements in the "Find Usages" window.
+ *
  * @author Shahar Ariel
  */
 public class SdRankProfileGroupingRule extends SingleParentUsageGroupingRule implements DumbAware {
@@ -34,4 +35,5 @@ public class SdRankProfileGroupingRule extends SingleParentUsageGroupingRule imp
 
         return null;
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRuleProvider.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRuleProvider.java
index e027e7c69a9..0726e103943 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRuleProvider.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdRankProfileGroupingRuleProvider.java
@@ -9,6 +9,7 @@ import org.jetbrains.annotations.Nullable;
 
 /**
  * This class is used for the extension (in plugin.xml) to the class SdRankProfileGroupingRule.
+ *
  * @author Shahar Ariel
  */
 public class SdRankProfileGroupingRuleProvider implements FileStructureGroupRuleProvider {
@@ -17,4 +18,5 @@ public class SdRankProfileGroupingRuleProvider implements FileStructureGroupRule
     public @Nullable UsageGroupingRule getUsageGroupingRule(@NotNull Project project) {
         return new SdRankProfileGroupingRule();
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java
index ea8fe5b6738..6f24ce27476 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/findUsages/SdUsageGroup.java
@@ -17,10 +17,12 @@ import org.jetbrains.annotations.Nullable;
 import javax.swing.*;
 
 /**
- * This class represent a group of elements in the "Find Usages" window.
+ * A group of elements in the "Find Usages" window.
+ *
  * @author Shahar Ariel
  */
 public class SdUsageGroup implements UsageGroup {
+
     private final VirtualFile myFile;
     private final SmartPsiElementPointer<SdDeclaration> myElementPointer;
     private final String myText;
@@ -107,4 +109,5 @@ public class SdUsageGroup implements UsageGroup {
     
     @Override
     public void update() {} 
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyBrowser.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyBrowser.java
index 919a3224552..38817e15553 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyBrowser.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyBrowser.java
@@ -21,7 +21,8 @@ import java.util.Map;
 import javax.swing.JTree;
 
 /**
- * This class is a browser for the "Call Hierarchy" window.
+ * A browser for the "Call Hierarchy" window.
+ *
  * @author Shahar Ariel
  */
 public class SdCallHierarchyBrowser extends CallHierarchyBrowserBase {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyNodeDescriptor.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyNodeDescriptor.java
index 7a435897ed9..f99a82dc81a 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyNodeDescriptor.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyNodeDescriptor.java
@@ -21,7 +21,8 @@ import org.jetbrains.annotations.NotNull;
 import javax.swing.Icon;
 
 /**
- * This class represents a node descriptor to a node in a tree in the "Call Hierarchy" window.
+ * A node descriptor to a node in a tree in the "Call Hierarchy" window.
+ *
  * @author Shahar Ariel
  */
 public class SdCallHierarchyNodeDescriptor extends HierarchyNodeDescriptor {
@@ -68,10 +69,7 @@ public class SdCallHierarchyNodeDescriptor extends HierarchyNodeDescriptor {
         if (!Comparing.equal(myHighlightedText, oldText)) {
             changes = true;
         }
-        
-        
         return changes;
-
     }
     
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyProvider.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyProvider.java
index 063b646a5f4..f7f243356b9 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyProvider.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallHierarchyProvider.java
@@ -1,7 +1,6 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.intellij.schema.hierarchy;
 
-
 import com.intellij.ide.hierarchy.CallHierarchyBrowserBase;
 import com.intellij.ide.hierarchy.HierarchyBrowser;
 import com.intellij.ide.hierarchy.HierarchyProvider;
@@ -20,6 +19,7 @@ import com.intellij.openapi.project.Project;
 
 /**
  * This class is used for the extension (in plugin.xml), to enable "Call Hierarchy" window using the plugin code.
+ *
  * @author Shahar Ariel
  */
 public class SdCallHierarchyProvider implements HierarchyProvider {
@@ -61,4 +61,5 @@ public class SdCallHierarchyProvider implements HierarchyProvider {
     public void browserActivated(@NotNull HierarchyBrowser hierarchyBrowser) {
         ((SdCallHierarchyBrowser) hierarchyBrowser).changeView(CallHierarchyBrowserBase.getCallerType());
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java
index 7db0f510974..053e7bd20f9 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallTreeStructure.java
@@ -20,10 +20,12 @@ import java.util.HashSet;
 import java.util.List;
 
 /**
- * This abstract class represents a general tree in the "Call Hierarchy" window.
+ * A general tree in the "Call Hierarchy" window.
+ *
  * @author Shahar Ariel
  */
 public abstract class SdCallTreeStructure extends HierarchyTreeStructure {
+
     protected final String myScopeType;
     protected final SdFile myFile;
     protected HashMap<String, List<PsiElement>> macrosMap;
@@ -73,4 +75,5 @@ public abstract class SdCallTreeStructure extends HierarchyTreeStructure {
         }
         return ArrayUtil.toObjectArray(descriptors);
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCalleeTreeStructure.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCalleeTreeStructure.java
index 5e86f9a83c4..37fd336b615 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCalleeTreeStructure.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCalleeTreeStructure.java
@@ -17,7 +17,8 @@ import java.util.HashSet;
 import java.util.List;
 
 /**
- * This class represents a Callee tree in the "Call Hierarchy" window.
+ * A Callee tree in the "Call Hierarchy" window.
+ *
  * @author Shahar Ariel
  */
 public class SdCalleeTreeStructure extends SdCallTreeStructure {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallerTreeStructure.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallerTreeStructure.java
index 06c100a037a..444e71978c9 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallerTreeStructure.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdCallerTreeStructure.java
@@ -19,7 +19,8 @@ import java.util.List;
 import java.util.function.Consumer;
 
 /**
- * This class represents a Caller tree in the "Call Hierarchy" window.
+ * A Caller tree in the "Call Hierarchy" window.
+ *
  * @author Shahar Ariel
  */
 public class SdCallerTreeStructure extends SdCallTreeStructure {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdHierarchyUtil.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdHierarchyUtil.java
index 6840b1b528b..dc925f0f369 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdHierarchyUtil.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/hierarchy/SdHierarchyUtil.java
@@ -17,7 +17,8 @@ import java.util.Comparator;
 import java.util.HashSet;
 
 /**
- * This class is util class to the Call Hierarchy feature.
+ * Call Hierarchy feature utilities.
+ *
  * @author Shahar Ariel
  */
 public class SdHierarchyUtil {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/lexer/SdLexerAdapter.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/lexer/SdLexerAdapter.java
index 1253b05bc89..8b474dcff69 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/lexer/SdLexerAdapter.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/lexer/SdLexerAdapter.java
@@ -4,7 +4,8 @@ package ai.vespa.intellij.schema.lexer;
 import com.intellij.lexer.FlexAdapter;
 
 /**
- * This class adapts the JFlex lexer to the IntelliJ Platform Lexer API.
+ * Adapter of the JFlex lexer to the IntelliJ Platform Lexer API.
+ *
  * @author Shahar Ariel
  */
 public class SdLexerAdapter extends FlexAdapter {
@@ -12,4 +13,5 @@ public class SdLexerAdapter extends FlexAdapter {
     public SdLexerAdapter() {
         super(new SdLexer(null));
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/parser/SdParserDefinition.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/parser/SdParserDefinition.java
index 26b0e63d679..d5b76c039d0 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/parser/SdParserDefinition.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/parser/SdParserDefinition.java
@@ -20,9 +20,11 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * This class is used for the extension (in plugin.xml), to make the parsing process use the plugin code.
+ *
  * @author Shahar Ariel
  */
 public class SdParserDefinition implements ParserDefinition {
+
     public static final TokenSet WHITE_SPACES = TokenSet.create(TokenType.WHITE_SPACE);
     public static final TokenSet COMMENTS = TokenSet.create(SdTypes.COMMENT);
     public static final TokenSet STRINGS = TokenSet.create(SdTypes.STRING_REG);
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdDeclaration.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdDeclaration.java
index 4fa50ba9a6d..c2880181d66 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdDeclaration.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdDeclaration.java
@@ -5,7 +5,8 @@ import com.intellij.navigation.NavigationItem;
 import com.intellij.psi.PsiElement;
 
 /**
- * This interface represents a declaration in the SD language.
+ * A declaration in the SD language.
+ *
  * @author Shahar Ariel
  */
 public interface SdDeclaration extends PsiElement, NavigationItem, SdNamedElement {}
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdDeclarationType.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdDeclarationType.java
index 341f20d6d52..129a32153f0 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdDeclarationType.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdDeclarationType.java
@@ -3,9 +3,11 @@ package ai.vespa.intellij.schema.psi;
 
 /**
  * This Enum describes the different declarations' types and their names.
+ *
  * @author Shahar Ariel
  */
 public enum SdDeclarationType {
+
     DOCUMENT("Document"),
     STRUCT("Struct"),
     ANNOTATION("Annotation"),
@@ -31,4 +33,5 @@ public enum SdDeclarationType {
     public String toString() {
         return typeName;
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementDescriptionProvider.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementDescriptionProvider.java
index fe42e60151d..7cd2d7f9331 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementDescriptionProvider.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementDescriptionProvider.java
@@ -11,12 +11,14 @@ import org.jetbrains.annotations.Nullable;
 /**
  * This class is used for the extension (in plugin.xml), to enable "find Usages" window take the element description from 
  * here. Used only for the "target" element.
+ *
  * @author Shahar Ariel
  */
 public class SdElementDescriptionProvider implements ElementDescriptionProvider {
     
     /**
-     * Controls the headline of the element in the "Find Usages" window
+     * Controls the headline of the element in the "Find Usages" window.
+     *
      * @param psiElement the element to describe
      * @return a string with the description to write in the headline
      */
@@ -29,4 +31,5 @@ public class SdElementDescriptionProvider implements ElementDescriptionProvider
             return "";
         }
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementFactory.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementFactory.java
index a280bcc05cf..d6cbcece6d5 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementFactory.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementFactory.java
@@ -9,6 +9,7 @@ import ai.vespa.intellij.schema.SdFileType;
 
 /**
  * This class is a factory of psi elements in the SD PSI tree.
+ *
  * @author Shahar Ariel
  */
 public class SdElementFactory {
@@ -32,4 +33,5 @@ public class SdElementFactory {
         return (SdFile) PsiFileFactory.getInstance(project).
             createFileFromText(name, SdFileType.INSTANCE, text);
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementType.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementType.java
index a004f3e907a..e8154bce8ad 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementType.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdElementType.java
@@ -7,7 +7,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * This class represent a SdElementType.
+ * An SdElementType.
+ *
  * @author Shahar Ariel
  */
 public class SdElementType extends IElementType {
@@ -15,4 +16,5 @@ public class SdElementType extends IElementType {
     public SdElementType(@NotNull @NonNls String debugName) {
         super(debugName, SdLanguage.INSTANCE);
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdFile.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdFile.java
index 885b247b9e2..1260883c96f 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdFile.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdFile.java
@@ -9,7 +9,8 @@ import ai.vespa.intellij.schema.SdLanguage;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * This class represent an SD file.
+ * An SD file.
+ *
  * @author Shahar Ariel
  */
 public class SdFile extends PsiFileBase {
@@ -28,4 +29,5 @@ public class SdFile extends PsiFileBase {
     public String toString() {
         return "Sd File";
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdFunctionDefinitionInterface.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdFunctionDefinitionInterface.java
index 1b64515debd..e7fa94cf81c 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdFunctionDefinitionInterface.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdFunctionDefinitionInterface.java
@@ -4,10 +4,12 @@ import com.intellij.psi.util.PsiTreeUtil;
 import ai.vespa.intellij.schema.SdUtil;
 
 /**
- * This interface represents a function's declaration in the SD language.
+ * A function's declaration in the SD language.
+ *
  * @author Shahar Ariel
  */
 public interface SdFunctionDefinitionInterface extends SdDeclaration {
+
     default boolean isOverride() {
         String macroName = this.getName();
         
@@ -24,6 +26,6 @@ public interface SdFunctionDefinitionInterface extends SdDeclaration {
             curRankProfile = (SdRankProfileDefinition) SdUtil.getRankProfileParent(curRankProfile);
         }
         return false;
-        
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdNamedElement.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdNamedElement.java
index 1a658f46d5c..0cd7cedc967 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdNamedElement.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdNamedElement.java
@@ -6,6 +6,7 @@ import com.intellij.psi.PsiNameIdentifierOwner;
 /**
  * This interface is used to wrap a Psi Element with SdNamedElement interface, which enables the element to be a
  * "name owner" (like an identifier). It allows the element to take a part in references, find usages and more.
+ *
  * @author Shahar Ariel
  */
 public interface SdNamedElement extends PsiNameIdentifierOwner {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdTokenType.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdTokenType.java
index ab439e88f0c..e42906530b0 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdTokenType.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/SdTokenType.java
@@ -7,7 +7,8 @@ import org.jetbrains.annotations.NonNls;
 import org.jetbrains.annotations.NotNull;
 
 /**
- * This class represent a SdTokenType.
+ * An SdTokenType.
+ *
  * @author Shahar Ariel
  */
 public class SdTokenType extends IElementType {
@@ -20,4 +21,5 @@ public class SdTokenType extends IElementType {
     public String toString() {
         return "SdTokenType." + super.toString();
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdFirstPhaseDefinitionMixin.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdFirstPhaseDefinitionMixin.java
index ee04943f4e8..43c02ea4fcf 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdFirstPhaseDefinitionMixin.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdFirstPhaseDefinitionMixin.java
@@ -1,3 +1,4 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.intellij.schema.psi.impl;
 
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
@@ -14,6 +15,7 @@ import javax.swing.Icon;
 /**
  * This class is used for methods' implementations for SdFirstPhaseDefinition. Connected with "mixin" to 
  * FirstPhaseDefinition rule in sd.bnf
+ *
  * @author Shahar Ariel
  */
 public class SdFirstPhaseDefinitionMixin extends ASTWrapperPsiElement {
@@ -56,3 +58,4 @@ public class SdFirstPhaseDefinitionMixin extends ASTWrapperPsiElement {
         };
     }
 }
+
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixin.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixin.java
index 90607039b75..897217c082c 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixin.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixin.java
@@ -1,3 +1,4 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.intellij.schema.psi.impl;
 
 import com.intellij.lang.ASTNode;
@@ -11,6 +12,7 @@ import org.jetbrains.annotations.NotNull;
 /**
  * This abstract class is used for methods' implementations for SdIdentifier. Connected with "mixin" to IdentifierVal and 
  * IdentifierWithDashVal rules in sd.bnf
+ *
  * @author Shahar Ariel
  */
 public abstract class SdIdentifierMixin extends SdIdentifierMixinImpl implements PsiNamedElement {
@@ -41,6 +43,4 @@ public abstract class SdIdentifierMixin extends SdIdentifierMixinImpl implements
         return this;
     }
     
-
-    
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixinImpl.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixinImpl.java
index 5b1e7aafe50..3f69952d0b6 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixinImpl.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdIdentifierMixinImpl.java
@@ -1,3 +1,4 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.intellij.schema.psi.impl;
 
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
@@ -10,6 +11,7 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * This class is used for methods' implementations for SdIdentifier. The abstract class SdIdentifierMixin extents it.
+ *
  * @author Shahar Ariel
  */
 public class SdIdentifierMixinImpl extends ASTWrapperPsiElement implements SdIdentifier {
@@ -22,4 +24,5 @@ public class SdIdentifierMixinImpl extends ASTWrapperPsiElement implements SdIde
     public PsiReference getReference() {
         return new SdReference(this, new TextRange(0, getNode().getText().length()));
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdNamedElementImpl.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdNamedElementImpl.java
index c1407e3e22c..ee328f43075 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdNamedElementImpl.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdNamedElementImpl.java
@@ -200,4 +200,5 @@ public abstract class SdNamedElementImpl extends ASTWrapperPsiElement implements
             }
         };
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdSummaryDefinitionMixin.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdSummaryDefinitionMixin.java
index 30d7e0744e6..71d93641939 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdSummaryDefinitionMixin.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/psi/impl/SdSummaryDefinitionMixin.java
@@ -1,3 +1,4 @@
+// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package ai.vespa.intellij.schema.psi.impl;
 
 import com.intellij.extapi.psi.ASTWrapperPsiElement;
@@ -13,6 +14,7 @@ import javax.swing.Icon;
 /**
  * This class is used for methods' implementations for SdSummaryDefinition. Connected with "mixin" to SummaryDefinition
  * rule in sd.bnf
+ *
  * @author Shahar Ariel
  */
 public abstract class SdSummaryDefinitionMixin extends ASTWrapperPsiElement {
@@ -54,4 +56,5 @@ public abstract class SdSummaryDefinitionMixin extends ASTWrapperPsiElement {
             }
         };
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewElement.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewElement.java
index a2cadee6942..76662c5cd31 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewElement.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewElement.java
@@ -23,6 +23,7 @@ import java.util.List;
 
 /**
  * This class is used for the presentation of an element in the "Structure View" window.
+ *
  * @author Shahar Ariel
  */
 public class SdStructureViewElement implements StructureViewTreeElement, SortableTreeElement {
@@ -91,4 +92,5 @@ public class SdStructureViewElement implements StructureViewTreeElement, Sortabl
         }
         return treeElements.toArray(new TreeElement[0]);
     }
+
 }
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewFactory.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewFactory.java
index 67208b04f0a..3d7b3a1a275 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewFactory.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewFactory.java
@@ -13,6 +13,7 @@ import org.jetbrains.annotations.Nullable;
 /**
  * This class is used for the extension (in plugin.xml) to the class SdStructureViewModel. It make the IDE use our 
  * plugin's code when creating the "Structure View" window.
+ *
  * @author Shahar Ariel
  */
 public class SdStructureViewFactory implements PsiStructureViewFactory {
diff --git a/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewModel.java b/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewModel.java
index 446f8e59837..1f1c271dcf6 100644
--- a/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewModel.java
+++ b/sd-plugin/src/main/java/ai/vespa/intellij/schema/structure/SdStructureViewModel.java
@@ -10,6 +10,8 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * This class represents the "Structure View" window.
+ *
+ * @author Shahar Ariel
  */
 public class SdStructureViewModel extends StructureViewModelBase implements StructureViewModel.ElementInfoProvider {
     public SdStructureViewModel(PsiFile psiFile) {