Change author name from shahariel to Shahar Ariel

15 files changed, 16 insertions, 16 deletions

diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdDeclaration.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdDeclaration.java
index 3fa6739161b..4f11a2b4b67 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdDeclaration.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdDeclaration.java
@@ -6,6 +6,6 @@ import com.intellij.psi.PsiElement;
 
 /**
  * This interface represents a declaration in the SD language.
- * @author shahariel
+ * @author Shahar Ariel
  */
 public interface SdDeclaration extends PsiElement, NavigationItem, SdNamedElement {}
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdDeclarationType.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdDeclarationType.java
index 5ea5968f0bb..c19e21d0f19 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdDeclarationType.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdDeclarationType.java
@@ -3,7 +3,7 @@ package org.intellij.sdk.language.psi;
 
 /**
  * This Enum describes the different declarations' types and their names.
- * @author shahariel
+ * @author Shahar Ariel
  */
 public enum SdDeclarationType {
     DOCUMENT("Document"),
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdElementDescriptionProvider.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdElementDescriptionProvider.java
index b2e99a9538a..76c4454b3b2 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdElementDescriptionProvider.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdElementDescriptionProvider.java
@@ -11,7 +11,7 @@ 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 shahariel
+ * @author Shahar Ariel
  */
 public class SdElementDescriptionProvider implements ElementDescriptionProvider {
     
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdElementFactory.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdElementFactory.java
index 9cb9690cd5b..1f3b98b6012 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdElementFactory.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdElementFactory.java
@@ -9,7 +9,7 @@ import org.intellij.sdk.language.SdFileType;
 
 /**
  * This class is a factory of psi elements in the SD PSI tree.
- * @author shahariel
+ * @author Shahar Ariel
  */
 public class SdElementFactory {
     
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdElementType.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdElementType.java
index a091d444d8e..b26cd66455d 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdElementType.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdElementType.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * This class represent a SdElementType.
- * @author shahariel
+ * @author Shahar Ariel
  */
 public class SdElementType extends IElementType {
     
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdFile.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdFile.java
index c044bdeeddd..c2d9249bce1 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdFile.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdFile.java
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * This class represent an SD file.
- * @author shahariel
+ * @author Shahar Ariel
  */
 public class SdFile extends PsiFileBase {
     
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdFunctionDefinitionInterface.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdFunctionDefinitionInterface.java
index d3738171343..78d964b45c9 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdFunctionDefinitionInterface.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdFunctionDefinitionInterface.java
@@ -5,7 +5,7 @@ import org.intellij.sdk.language.SdUtil;
 
 /**
  * This interface represents a function's declaration in the SD language.
- * @author shahariel
+ * @author Shahar Ariel
  */
 public interface SdFunctionDefinitionInterface extends SdDeclaration {
     default boolean isOverride() {
@@ -17,7 +17,7 @@ public interface SdFunctionDefinitionInterface extends SdDeclaration {
         }
         while (curRankProfile != null) {
             for (SdFunctionDefinition macro : PsiTreeUtil.collectElementsOfType(curRankProfile, SdFunctionDefinition.class)) {
-                if (macro.getName().equals(macroName)) {
+                if (macro.getName() != null && macro.getName().equals(macroName)) {
                     return true;
                 }
             }
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdIdentifier.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdIdentifier.java
index 141d0abd403..e20eb4cb6c4 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdIdentifier.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdIdentifier.java
@@ -6,7 +6,7 @@ import com.intellij.psi.util.PsiTreeUtil;
 
 /**
  * This interface represents an identifier in the SD language (regular identifiers and identifiers with dash).
- * @author shahariel
+ * @author Shahar Ariel
  */
 public interface SdIdentifier extends PsiElement {
 
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdNamedElement.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdNamedElement.java
index bd74a87b551..6e56f548410 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdNamedElement.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdNamedElement.java
@@ -6,7 +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 shahariel
+ * @author Shahar Ariel
  */
 public interface SdNamedElement extends PsiNameIdentifierOwner {
     
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdTokenType.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdTokenType.java
index 98e7494389d..1024995832d 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdTokenType.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/SdTokenType.java
@@ -8,7 +8,7 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * This class represent a SdTokenType.
- * @author shahariel
+ * @author Shahar Ariel
  */
 public class SdTokenType extends IElementType {
     
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdFirstPhaseDefinitionMixin.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdFirstPhaseDefinitionMixin.java
index 84878294d58..1a13318a38f 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdFirstPhaseDefinitionMixin.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdFirstPhaseDefinitionMixin.java
@@ -14,7 +14,7 @@ import javax.swing.Icon;
 /**
  * This class is used for methods' implementations for SdFirstPhaseDefinition. Connected with "mixin" to 
  * FirstPhaseDefinition rule in sd.bnf
- * @author shahariel
+ * @author Shahar Ariel
  */
 public class SdFirstPhaseDefinitionMixin extends ASTWrapperPsiElement {
     
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdIdentifierMixin.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdIdentifierMixin.java
index 951f90b0793..536dfc4f2cc 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdIdentifierMixin.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdIdentifierMixin.java
@@ -11,7 +11,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 shahariel
+ * @author Shahar Ariel
  */
 public abstract class SdIdentifierMixin extends SdIdentifierMixinImpl implements PsiNamedElement {
     
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdIdentifierMixinImpl.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdIdentifierMixinImpl.java
index 69ccf9eda2a..7b738cc1b0f 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdIdentifierMixinImpl.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdIdentifierMixinImpl.java
@@ -10,7 +10,7 @@ import org.jetbrains.annotations.NotNull;
 
 /**
  * This class is used for methods' implementations for SdIdentifier. The abstract class SdIdentifierMixin extents it.
- * @author shahariel
+ * @author Shahar Ariel
  */
 public class SdIdentifierMixinImpl extends ASTWrapperPsiElement implements SdIdentifier {
     
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdNamedElementImpl.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdNamedElementImpl.java
index 0bc1a1eaad3..2c2a7aae3b1 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdNamedElementImpl.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdNamedElementImpl.java
@@ -38,7 +38,7 @@ import javax.swing.Icon;
 /**
  * This abstract class 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 shahariel
+ * @author Shahar Ariel
  */
 public abstract class SdNamedElementImpl extends ASTWrapperPsiElement implements SdNamedElement {
     
diff --git a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdSummaryDefinitionMixin.java b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdSummaryDefinitionMixin.java
index 7c56acce1e9..085b1e04102 100644
--- a/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdSummaryDefinitionMixin.java
+++ b/sd-plugin/src/main/java/org/intellij/sdk/language/psi/impl/SdSummaryDefinitionMixin.java
@@ -13,7 +13,7 @@ import javax.swing.Icon;
 /**
  * This class is used for methods' implementations for SdSummaryDefinition. Connected with "mixin" to SummaryDefinition
  * rule in sd.bnf
- * @author shahariel
+ * @author Shahar Ariel
  */
 public abstract class SdSummaryDefinitionMixin extends ASTWrapperPsiElement {