Skip to content

Fixing compilation after platform update #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
VISTALL merged 1 commit into from
Apr 21, 2026
Merged

Fixing compilation after platform update #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 7 additions & 8 deletions src/main/java/com/sylvanaar/idea/lua/lang/template/LuaFileMacro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,12 @@
import consulo.language.editor.template.macro.Macro;
import consulo.language.psi.PsiDocumentManager;
import consulo.language.psi.PsiFile;
import consulo.localize.LocalizeValue;
import jakarta.annotation.Nonnull;

/**
* Created by IntelliJ IDEA.
* User: Jon S Akhtar
* Date: 2/25/11
* Time: 1:35 PM
* @author Jon S Akhtar
* @since 2011-02-25
*/
@ExtensionImpl
public class LuaFileMacro extends Macro {
Expand All @@ -42,8 +41,8 @@ public String getName() {
}

@Override
public String getPresentableName() {
return "currentLuaFile()";
public LocalizeValue getPresentableName() {
return LocalizeValue.of("currentLuaFile()");
}

@Nonnull
Expand All @@ -54,8 +53,8 @@ public String getDefaultValue() {

@Override
public Result calculateResult(@Nonnull Expression[] expressions, ExpressionContext expressionContext) {
PsiFile file = PsiDocumentManager.getInstance(
expressionContext.getProject()).getPsiFile(expressionContext.getEditor().getDocument());
PsiFile file = PsiDocumentManager.getInstance(expressionContext.getProject())
.getPsiFile(expressionContext.getEditor().getDocument());

if (file instanceof LuaPsiFile) {
return new TextResult(file.getName());
Expand Down
25 changes: 12 additions & 13 deletions src/main/java/com/sylvanaar/idea/lua/lang/template/LuaFunctionMacro.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile;
import com.sylvanaar.idea.lua.lang.psi.expressions.LuaAnonymousFunctionExpression;
import com.sylvanaar.idea.lua.lang.psi.statements.LuaFunctionDefinitionStatement;
import consulo.annotation.access.RequiredReadAction;
import consulo.annotation.component.ExtensionImpl;
import consulo.language.editor.completion.lookup.LookupElement;
import consulo.language.editor.template.Expression;
Expand All @@ -30,13 +31,12 @@
import consulo.language.psi.PsiDocumentManager;
import consulo.language.psi.PsiElement;
import consulo.language.psi.PsiFile;
import consulo.localize.LocalizeValue;
import jakarta.annotation.Nonnull;

/**
* Created by IntelliJ IDEA.
* User: Jon S Akhtar
* Date: 2/25/11
* Time: 1:35 PM
* @author Jon S Akhtar
* @since 2011-02-25
*/
@ExtensionImpl
public class LuaFunctionMacro extends Macro {
Expand All @@ -46,8 +46,8 @@ public String getName() {
}

@Override
public String getPresentableName() {
return "currentLuaFunction()";
public LocalizeValue getPresentableName() {
return LocalizeValue.of("currentLuaFunction()");
}

@Nonnull
Expand All @@ -57,9 +57,10 @@ public String getDefaultValue() {
}

@Override
@RequiredReadAction
public Result calculateResult(@Nonnull Expression[] expressions, ExpressionContext expressionContext) {
PsiFile file = PsiDocumentManager.getInstance(expressionContext.getProject()).getPsiFile(
expressionContext.getEditor().getDocument());
PsiFile file = PsiDocumentManager.getInstance(expressionContext.getProject())
.getPsiFile(expressionContext.getEditor().getDocument());

if (file instanceof LuaPsiFile) {
PsiElement e = file.findElementAt(expressionContext.getTemplateStartOffset());
Expand All @@ -70,15 +71,14 @@ public Result calculateResult(@Nonnull Expression[] expressions, ExpressionConte
}

e = e.getContext();

}

if (e == null) {
return null;
}

if (e instanceof LuaFunctionDefinitionStatement) {
String name = ((LuaFunctionDefinitionStatement) e).getIdentifier().getName();
if (e instanceof LuaFunctionDefinitionStatement funDef) {
String name = funDef.getIdentifier().getName();

if (name != null) {
return new TextResult(name);
Expand All @@ -99,8 +99,7 @@ public Result calculateQuickResult(@Nonnull Expression[] expressions, Expression
}

@Override
public LookupElement[] calculateLookupItems(@Nonnull Expression[] expressions,
ExpressionContext expressionContext) {
public LookupElement[] calculateLookupItems(@Nonnull Expression[] expressions, ExpressionContext expressionContext) {
return new LookupElement[0];
}
}
Loading