Skip to content

Fixing compilation. Commenting interpreters since they're incompatible with modules and produce error "module *** reads package se.krka.kahlua.j2se from both interpreter and j2se" #5

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
Dec 19, 2025
Merged

Fixing compilation. Commenting interpreters since they're incompatible with modules and produce error "module *** reads package se.krka.kahlua.j2se from both interpreter and j2se" #5

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
21 changes: 13 additions & 8 deletions src/main/java/com/sylvanaar/idea/lua/LuaFileType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/

package com.sylvanaar.idea.lua;

import com.sylvanaar.idea.lua.lang.LuaLanguage;
Expand All @@ -22,11 +21,11 @@
import consulo.localize.LocalizeValue;
import consulo.lua.localize.LuaLocalize;
import consulo.ui.image.Image;
import consulo.virtualFileSystem.internal.matcher.ExtensionFileNameMatcher;
import consulo.virtualFileSystem.fileType.FileNameMatcher;
import consulo.virtualFileSystem.fileType.FileNameMatcherFactory;
import jakarta.annotation.Nonnull;
import org.jetbrains.annotations.NonNls;

import javax.annotation.Nonnull;

/**
* Created by IntelliJ IDEA.
* User: Max
Expand All @@ -42,9 +41,16 @@ public class LuaFileType extends LanguageFileType {
public static final String DEFAULT_EXTENSION = "lua";
public static final String LUA = "Lua";

public static final ExtensionFileNameMatcher[] EXTENSION_FILE_NAME_MATCHERS = {
new ExtensionFileNameMatcher(LuaFileType.DEFAULT_EXTENSION), new ExtensionFileNameMatcher("doclua"), new ExtensionFileNameMatcher("wlua"),
};
public static final FileNameMatcher[] EXTENSION_FILE_NAME_MATCHERS;

static {
FileNameMatcherFactory factory = FileNameMatcherFactory.getInstance();
EXTENSION_FILE_NAME_MATCHERS = new FileNameMatcher[] {
factory.createExtensionFileNameMatcher(LuaFileType.DEFAULT_EXTENSION),
factory.createExtensionFileNameMatcher("doclua"),
factory.createExtensionFileNameMatcher("wlua")
};
}

private LuaFileType() {
super(LuaLanguage.INSTANCE);
Expand Down Expand Up @@ -77,7 +83,6 @@ public String getDefaultExtension() {
public Image getIcon() {
return com.sylvanaar.idea.lua.LuaIcons.LUA_ICON;
}

}


Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/sylvanaar/idea/lua/LuaFileTypeLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,7 @@
import consulo.annotation.component.ExtensionImpl;
import consulo.virtualFileSystem.fileType.FileTypeConsumer;
import consulo.virtualFileSystem.fileType.FileTypeFactory;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;

/**
* Created by IntelliJ IDEA.
Expand Down
28 changes: 14 additions & 14 deletions src/main/java/com/sylvanaar/idea/lua/actions/GenerateLuaListingAction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,35 +16,35 @@

package com.sylvanaar.idea.lua.actions;

import com.sylvanaar.idea.lua.LuaFileType;
import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile;
import com.sylvanaar.idea.lua.sdk.StdLibrary;
import com.sylvanaar.idea.lua.util.LuaModuleUtil;
import com.sylvanaar.idea.lua.util.LuaSystemUtil;
import consulo.application.ApplicationManager;
import consulo.content.bundle.Sdk;
import consulo.document.FileDocumentManager;
import consulo.execution.ui.console.ConsoleViewContentType;
import consulo.fileEditor.FileEditorManager;
import consulo.ide.IdeView;
import consulo.language.editor.LangDataKeys;
import consulo.language.psi.PsiDirectory;
import consulo.language.psi.PsiElement;
import consulo.language.psi.PsiFile;
import consulo.language.psi.PsiFileFactory;
import consulo.lua.bundle.BaseLuaSdkType;
import consulo.module.Module;
import consulo.module.ModuleManager;
import consulo.navigation.OpenFileDescriptor;
import consulo.navigation.OpenFileDescriptorFactory;
import consulo.process.ExecutionException;
import consulo.process.local.ProcessOutput;
import consulo.process.util.ProcessOutput;
import consulo.project.Project;
import consulo.ui.ex.action.AnAction;
import consulo.ui.ex.action.AnActionEvent;
import consulo.language.editor.LangDataKeys;
import consulo.application.ApplicationManager;
import consulo.module.Module;
import consulo.project.Project;
import consulo.content.bundle.Sdk;
import consulo.util.lang.StringUtil;
import consulo.virtualFileSystem.VirtualFile;
import consulo.language.psi.PsiElement;
import consulo.language.psi.PsiFile;
import com.sylvanaar.idea.lua.LuaFileType;
import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile;
import com.sylvanaar.idea.lua.sdk.StdLibrary;
import com.sylvanaar.idea.lua.util.LuaModuleUtil;
import com.sylvanaar.idea.lua.util.LuaSystemUtil;
import consulo.util.lang.ref.Ref;
import consulo.virtualFileSystem.VirtualFile;

/**
* Created by IntelliJ IDEA.
Expand Down
23 changes: 11 additions & 12 deletions src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaMethodSeparatorMarkerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,28 +17,27 @@
package com.sylvanaar.idea.lua.codeInsight;

import com.sylvanaar.idea.lua.lang.LuaLanguage;
import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocComment;
import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocCommentOwner;
import com.sylvanaar.idea.lua.lang.psi.LuaFunctionDefinition;
import consulo.annotation.access.RequiredReadAction;
import consulo.annotation.component.ExtensionImpl;
import consulo.codeEditor.CodeInsightColors;
import consulo.codeEditor.markup.GutterIconRenderer;
import consulo.codeEditor.markup.SeparatorPlacement;
import consulo.colorScheme.EditorColorsManager;
import consulo.colorScheme.EditorColorsScheme;
import consulo.document.util.TextRange;
import consulo.language.Language;
import consulo.language.editor.DaemonCodeAnalyzerSettings;
import consulo.language.editor.gutter.LineMarkerInfo;
import consulo.colorScheme.EditorColorsManager;
import consulo.codeEditor.markup.SeparatorPlacement;
import consulo.document.util.TextRange;
import consulo.language.psi.PsiElement;
import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocComment;
import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocCommentOwner;
import com.sylvanaar.idea.lua.lang.psi.LuaFunctionDefinition;
import consulo.annotation.access.RequiredReadAction;
import consulo.language.editor.Pass;
import consulo.language.editor.gutter.LineMarkerInfo;
import consulo.language.editor.gutter.LineMarkerProvider;
import consulo.language.psi.PsiElement;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;
import jakarta.inject.Inject;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

@ExtensionImpl
public class LuaMethodSeparatorMarkerProvider implements LineMarkerProvider
{
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaParameterInfoHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@
import consulo.language.psi.PsiElement;
import consulo.language.psi.PsiFile;
import consulo.language.psi.PsiWhiteSpace;
import jakarta.annotation.Nonnull;

import javax.annotation.Nonnull;
import java.util.List;

/**
Expand Down
9 changes: 5 additions & 4 deletions src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaTailCallLineMarkerProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@
import consulo.language.editor.gutter.LineMarkerInfo;
import consulo.language.editor.gutter.LineMarkerProviderDescriptor;
import consulo.language.psi.PsiElement;
import consulo.localize.LocalizeValue;
import consulo.ui.image.Image;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import java.util.function.Function;

@ExtensionImpl
Expand Down Expand Up @@ -58,8 +59,8 @@ public Image getIcon() {

@Nullable
@Override
public String getName() {
return "Tail call";
public LocalizeValue getName() {
return LocalizeValue.localizeTODO("Tail call");
}

@Nonnull
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/sylvanaar/idea/lua/copyright/UpdateLuaCopyrightsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,7 @@
import consulo.language.psi.PsiFile;
import consulo.project.Project;
import consulo.virtualFileSystem.fileType.FileType;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;

@ExtensionImpl
public class UpdateLuaCopyrightsProvider extends UpdateCopyrightsProvider<CopyrightFileConfig> {
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/sylvanaar/idea/lua/copyright/UpdateLuaFileCopyright.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@
import consulo.language.psi.PsiElement;
import consulo.language.psi.PsiFile;
import consulo.language.psi.PsiWhiteSpace;

import javax.annotation.Nonnull;
import jakarta.annotation.Nonnull;

public class UpdateLuaFileCopyright extends UpdatePsiFileCopyright<CopyrightFileConfig> {
public UpdateLuaFileCopyright(@Nonnull PsiFile psiFile, @Nonnull CopyrightProfile copyrightProfile) {
Expand Down
23 changes: 11 additions & 12 deletions src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugProcess.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,27 +16,26 @@

package com.sylvanaar.idea.lua.debugger;

import java.util.ArrayList;

import javax.annotation.Nonnull;
import javax.swing.SwingUtilities;

import consulo.application.progress.ProgressIndicator;
import consulo.application.progress.ProgressManager;
import consulo.application.progress.Task;
import consulo.execution.ExecutionResult;
import consulo.execution.debug.XDebugProcess;
import consulo.execution.debug.XDebugSession;
import consulo.execution.debug.XSourcePosition;
import consulo.execution.debug.breakpoint.XBreakpoint;
import consulo.execution.debug.breakpoint.XBreakpointHandler;
import consulo.execution.debug.evaluation.XDebuggerEditorsProvider;
import consulo.execution.ui.ExecutionConsole;
import consulo.execution.ui.console.ConsoleView;
import consulo.execution.ui.console.ConsoleViewContentType;
import consulo.logging.Logger;
import consulo.application.progress.ProgressIndicator;
import consulo.application.progress.ProgressManager;
import consulo.application.progress.Task;
import consulo.ui.ex.awt.Messages;
import consulo.execution.debug.XDebugProcess;
import consulo.execution.debug.breakpoint.XBreakpoint;
import consulo.execution.debug.breakpoint.XBreakpointHandler;
import consulo.process.ProcessHandler;
import consulo.ui.ex.awt.Messages;
import jakarta.annotation.Nonnull;

import javax.swing.*;
import java.util.ArrayList;

/**
* Created by IntelliJ IDEA.
Expand Down
19 changes: 9 additions & 10 deletions src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugRunner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,23 +16,22 @@

package com.sylvanaar.idea.lua.debugger;

import com.sylvanaar.idea.lua.run.LuaRunConfiguration;
import consulo.annotation.component.ExtensionImpl;
import consulo.document.FileDocumentManager;
import consulo.execution.ExecutionResult;
import consulo.execution.configuration.RunProfileState;
import consulo.execution.runner.ExecutionEnvironment;
import consulo.process.ExecutionException;
import consulo.execution.configuration.RunProfile;
import consulo.execution.configuration.RunProfileState;
import consulo.execution.debug.DefaultDebugExecutor;
import consulo.execution.runner.GenericProgramRunner;
import consulo.execution.ui.RunContentDescriptor;
import consulo.document.FileDocumentManager;
import consulo.execution.debug.XDebugSession;
import consulo.execution.debug.XDebuggerManager;
import com.sylvanaar.idea.lua.run.LuaRunConfiguration;
import consulo.execution.runner.ExecutionEnvironment;
import consulo.execution.runner.GenericProgramRunner;
import consulo.execution.ui.RunContentDescriptor;
import consulo.process.ExecutionException;
import consulo.ui.annotation.RequiredUIAccess;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

/**
* Created by IntelliJ IDEA.
Expand Down
11 changes: 3 additions & 8 deletions src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugValue.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,10 @@

package com.sylvanaar.idea.lua.debugger;

import javax.annotation.Nonnull;

import consulo.application.AllIcons;
import consulo.execution.debug.frame.*;
import consulo.execution.debug.frame.XValueNode;
import consulo.execution.debug.frame.XValuePlace;
import consulo.execution.debug.frame.XNavigatable;
import consulo.execution.debug.frame.XValueModifier;
import consulo.execution.debug.icon.ExecutionDebugIconGroup;
import consulo.logging.Logger;
import jakarta.annotation.Nonnull;

/**
* Created by IntelliJ IDEA.
Expand All @@ -45,7 +40,7 @@ public class LuaDebugValue extends XValue {

@Override
public void computePresentation(@Nonnull XValueNode node, @Nonnull XValuePlace place) {
node.setPresentation(AllIcons.Debugger.Value, myTypeName, myValueAsString, false);
node.setPresentation(ExecutionDebugIconGroup.nodeValue(), myTypeName, myValueAsString, false);
}

@Override
Expand Down
27 changes: 13 additions & 14 deletions src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebuggerEditorsProvider.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,25 +16,24 @@

package com.sylvanaar.idea.lua.debugger;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;

import consulo.execution.debug.evaluation.EvaluationMode;
import consulo.language.psi.*;
import consulo.logging.Logger;
import consulo.document.Document;
import consulo.document.FileDocumentManager;
import consulo.project.Project;
import consulo.virtualFileSystem.fileType.FileType;
import consulo.virtualFileSystem.VirtualFile;
import consulo.language.file.FileViewProvider;
import consulo.execution.debug.XSourcePosition;
import consulo.execution.debug.evaluation.XDebuggerEditorsProvider;
import com.sylvanaar.idea.lua.LuaFileType;
import com.sylvanaar.idea.lua.lang.lexer.LuaElementType;
import com.sylvanaar.idea.lua.lang.psi.LuaExpressionCodeFragment;
import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement;
import com.sylvanaar.idea.lua.lang.psi.LuaPsiElementFactory;
import consulo.document.Document;
import consulo.document.FileDocumentManager;
import consulo.execution.debug.XSourcePosition;
import consulo.execution.debug.evaluation.EvaluationMode;
import consulo.execution.debug.evaluation.XDebuggerEditorsProvider;
import consulo.language.file.FileViewProvider;
import consulo.language.psi.*;
import consulo.logging.Logger;
import consulo.project.Project;
import consulo.virtualFileSystem.VirtualFile;
import consulo.virtualFileSystem.fileType.FileType;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

/**
* Created by IntelliJ IDEA.
Expand Down
8 changes: 3 additions & 5 deletions src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebuggerEvaluator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,12 @@

package com.sylvanaar.idea.lua.debugger;

import javax.annotation.Nonnull;

import consulo.execution.debug.XSourcePosition;
import consulo.logging.Logger;
import consulo.execution.debug.evaluation.XDebuggerEvaluator;
import consulo.logging.Logger;
import consulo.project.Project;

import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

/**
* Created by IntelliJ IDEA.
Expand Down
3 changes: 1 addition & 2 deletions src/main/java/com/sylvanaar/idea/lua/debugger/LuaLineBreakpointHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package com.sylvanaar.idea.lua.debugger;

import javax.annotation.Nonnull;

import consulo.execution.debug.breakpoint.XBreakpoint;
import consulo.execution.debug.breakpoint.XBreakpointHandler;
import jakarta.annotation.Nonnull;

public class LuaLineBreakpointHandler extends XBreakpointHandler
{
Expand Down
5 changes: 2 additions & 3 deletions src/main/java/com/sylvanaar/idea/lua/debugger/LuaLineBreakpointType.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,8 @@
import consulo.lua.debugger.breakpoint.LuaLineBreakpointProperties;
import consulo.project.Project;
import consulo.virtualFileSystem.VirtualFile;

import javax.annotation.Nonnull;
import javax.annotation.Nullable;
import jakarta.annotation.Nonnull;
import jakarta.annotation.Nullable;

/**
* Created by IntelliJ IDEA.
Expand Down
Loading
Loading