Fixing compilation after platform update. (#120)

Author: unv-unv

plugin/src/main/java/com/intellij/javascript/JSClassNameMacro.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.javascript;
 
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.resolve.JSResolveUtil;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.completion.lookup.LookupElement;
@@ -30,9 +30,9 @@
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.PsiFile;
 import consulo.language.psi.util.PsiTreeUtil;
+import consulo.localize.LocalizeValue;
 import consulo.project.Project;
 
-
 @ExtensionImpl
 public class JSClassNameMacro extends Macro {
     @Override
@@ -41,8 +41,8 @@ public String getName() {
     }
 
     @Override
-    public String getPresentableName() {
-        return JavaScriptLocalize.jsClassnameMacroDescription().get();
+    public LocalizeValue getPresentableName() {
+        return JavaScriptLocalize.jsClassnameMacroDescription();
     }
 
     @Override
@@ -51,6 +51,7 @@ public String getDefaultValue() {
     }
 
     @Override
+    @RequiredReadAction
     public Result calculateResult(Expression[] params, ExpressionContext context) {
         PsiElement elementAtCaret = findElementAtCaret(context);
         JSResolveUtil.ContextResolver resolver = new JSResolveUtil.ContextResolver(elementAtCaret);
@@ -71,6 +72,7 @@ public Result calculateResult(Expression[] params, ExpressionContext context) {
         return null;
     }
 
+    @RequiredReadAction
     public static PsiElement findElementAtCaret(ExpressionContext context) {
         Project project = context.getProject();
         int templateStartOffset = context.getTemplateStartOffset();

plugin/src/main/java/com/intellij/javascript/JSMethodNameMacro.java

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package com.intellij.javascript;
 
 import com.intellij.lang.javascript.psi.JSFunction;
 import com.intellij.lang.javascript.psi.JSFunctionExpression;
+import consulo.annotation.access.RequiredReadAction;
 import consulo.annotation.component.ExtensionImpl;
 import consulo.javascript.localize.JavaScriptLocalize;
 import consulo.language.editor.completion.lookup.LookupElement;
@@ -28,7 +28,7 @@
 import consulo.language.editor.template.macro.Macro;
 import consulo.language.psi.PsiElement;
 import consulo.language.psi.util.PsiTreeUtil;
-
+import consulo.localize.LocalizeValue;
 
 @ExtensionImpl
 public class JSMethodNameMacro extends Macro {
@@ -38,8 +38,8 @@ public String getName() {
     }
 
     @Override
-    public String getPresentableName() {
-        return JavaScriptLocalize.jsMethodnameMacroDescription().get();
+    public LocalizeValue getPresentableName() {
+        return JavaScriptLocalize.jsMethodnameMacroDescription();
     }
 
     @Override
@@ -48,6 +48,7 @@ public String getDefaultValue() {
     }
 
     @Override
+    @RequiredReadAction
     public Result calculateResult(Expression[] params, ExpressionContext context) {
         PsiElement elementAtCaret = JSClassNameMacro.findElementAtCaret(context);
         if (elementAtCaret != null) {