diff --git a/src/main/java/com/sylvanaar/idea/lua/LuaFileType.java b/src/main/java/com/sylvanaar/idea/lua/LuaFileType.java index 2debe07f..e98ebd94 100644 --- a/src/main/java/com/sylvanaar/idea/lua/LuaFileType.java +++ b/src/main/java/com/sylvanaar/idea/lua/LuaFileType.java @@ -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; @@ -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 @@ -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); @@ -77,7 +83,6 @@ public String getDefaultExtension() { public Image getIcon() { return com.sylvanaar.idea.lua.LuaIcons.LUA_ICON; } - } diff --git a/src/main/java/com/sylvanaar/idea/lua/LuaFileTypeLoader.java b/src/main/java/com/sylvanaar/idea/lua/LuaFileTypeLoader.java index a454802f..0f13b7b5 100644 --- a/src/main/java/com/sylvanaar/idea/lua/LuaFileTypeLoader.java +++ b/src/main/java/com/sylvanaar/idea/lua/LuaFileTypeLoader.java @@ -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. diff --git a/src/main/java/com/sylvanaar/idea/lua/actions/GenerateLuaListingAction.java b/src/main/java/com/sylvanaar/idea/lua/actions/GenerateLuaListingAction.java index 77c08bca..da23f363 100644 --- a/src/main/java/com/sylvanaar/idea/lua/actions/GenerateLuaListingAction.java +++ b/src/main/java/com/sylvanaar/idea/lua/actions/GenerateLuaListingAction.java @@ -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. diff --git a/src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaMethodSeparatorMarkerProvider.java b/src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaMethodSeparatorMarkerProvider.java index 7f0dbae4..26b6974b 100644 --- a/src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaMethodSeparatorMarkerProvider.java +++ b/src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaMethodSeparatorMarkerProvider.java @@ -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 { diff --git a/src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaParameterInfoHandler.java b/src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaParameterInfoHandler.java index db6662dd..13dc6aec 100644 --- a/src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaParameterInfoHandler.java +++ b/src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaParameterInfoHandler.java @@ -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; /** diff --git a/src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaTailCallLineMarkerProvider.java b/src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaTailCallLineMarkerProvider.java index 89b482a5..64fe8caa 100644 --- a/src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaTailCallLineMarkerProvider.java +++ b/src/main/java/com/sylvanaar/idea/lua/codeInsight/LuaTailCallLineMarkerProvider.java @@ -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 @@ -58,8 +59,8 @@ public Image getIcon() { @Nullable @Override - public String getName() { - return "Tail call"; + public LocalizeValue getName() { + return LocalizeValue.localizeTODO("Tail call"); } @Nonnull diff --git a/src/main/java/com/sylvanaar/idea/lua/copyright/UpdateLuaCopyrightsProvider.java b/src/main/java/com/sylvanaar/idea/lua/copyright/UpdateLuaCopyrightsProvider.java index c0e82922..608e9ea5 100644 --- a/src/main/java/com/sylvanaar/idea/lua/copyright/UpdateLuaCopyrightsProvider.java +++ b/src/main/java/com/sylvanaar/idea/lua/copyright/UpdateLuaCopyrightsProvider.java @@ -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 { diff --git a/src/main/java/com/sylvanaar/idea/lua/copyright/UpdateLuaFileCopyright.java b/src/main/java/com/sylvanaar/idea/lua/copyright/UpdateLuaFileCopyright.java index a09af8f7..b4e635ce 100644 --- a/src/main/java/com/sylvanaar/idea/lua/copyright/UpdateLuaFileCopyright.java +++ b/src/main/java/com/sylvanaar/idea/lua/copyright/UpdateLuaFileCopyright.java @@ -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 { public UpdateLuaFileCopyright(@Nonnull PsiFile psiFile, @Nonnull CopyrightProfile copyrightProfile) { diff --git a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugProcess.java b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugProcess.java index b6f4d91b..1755c400 100644 --- a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugProcess.java +++ b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugProcess.java @@ -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. diff --git a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugRunner.java b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugRunner.java index 5e8731b0..aa0af4ee 100644 --- a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugRunner.java +++ b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugRunner.java @@ -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. diff --git a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugValue.java b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugValue.java index 1b21a20e..b09a9b4e 100644 --- a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugValue.java +++ b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebugValue.java @@ -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. @@ -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 diff --git a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebuggerEditorsProvider.java b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebuggerEditorsProvider.java index 4ce3e454..8a67c77e 100644 --- a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebuggerEditorsProvider.java +++ b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebuggerEditorsProvider.java @@ -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. diff --git a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebuggerEvaluator.java b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebuggerEvaluator.java index 2c1d6a99..ecc81852 100644 --- a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebuggerEvaluator.java +++ b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaDebuggerEvaluator.java @@ -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. diff --git a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaLineBreakpointHandler.java b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaLineBreakpointHandler.java index b9d938b9..be185b0c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaLineBreakpointHandler.java +++ b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaLineBreakpointHandler.java @@ -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 { diff --git a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaLineBreakpointType.java b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaLineBreakpointType.java index b1555586..f03e6c8c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/debugger/LuaLineBreakpointType.java +++ b/src/main/java/com/sylvanaar/idea/lua/debugger/LuaLineBreakpointType.java @@ -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. diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/BaseNavigationItem.java b/src/main/java/com/sylvanaar/idea/lua/editor/BaseNavigationItem.java index e3e74af8..2268f639 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/BaseNavigationItem.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/BaseNavigationItem.java @@ -1,15 +1,14 @@ package com.sylvanaar.idea.lua.editor; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import consulo.language.impl.psi.FakePsiElement; -import org.jetbrains.annotations.NonNls; -import consulo.navigation.ItemPresentation; -import consulo.project.Project; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; +import consulo.navigation.ItemPresentation; +import consulo.project.Project; import consulo.ui.image.Image; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; public class BaseNavigationItem extends FakePsiElement { diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/annotator/LuaAnnotator.java b/src/main/java/com/sylvanaar/idea/lua/editor/annotator/LuaAnnotator.java index ce843e4c..238d1dc8 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/annotator/LuaAnnotator.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/annotator/LuaAnnotator.java @@ -40,9 +40,7 @@ import consulo.language.editor.annotation.Annotator; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiReference; - -import javax.annotation.Nonnull; - +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaCharFilter.java b/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaCharFilter.java index c0ab674a..b0dcacf6 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaCharFilter.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaCharFilter.java @@ -21,8 +21,7 @@ import consulo.language.editor.completion.lookup.CharFilter; import consulo.language.editor.completion.lookup.Lookup; import consulo.language.psi.PsiFile; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaCompletionContributor.java b/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaCompletionContributor.java index 91b0a36a..74c7534b 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaCompletionContributor.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaCompletionContributor.java @@ -52,8 +52,8 @@ import consulo.logging.Logger; import consulo.util.dataholder.Key; import consulo.util.lang.ObjectUtil; +import jakarta.annotation.Nonnull; -import javax.annotation.Nonnull; import java.util.*; import static consulo.language.pattern.PlatformPatterns.psiElement; diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaCompletionWeigher.java b/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaCompletionWeigher.java index 4d231076..a5339007 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaCompletionWeigher.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaCompletionWeigher.java @@ -33,9 +33,7 @@ import consulo.module.content.ProjectRootManager; import consulo.util.lang.StringUtil; import consulo.virtualFileSystem.VirtualFile; - -import javax.annotation.Nonnull; - +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaLookupElement.java b/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaLookupElement.java index 0313a4ba..0e8aecec 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaLookupElement.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/completion/LuaLookupElement.java @@ -31,8 +31,8 @@ import consulo.project.Project; import consulo.util.lang.StringUtil; import consulo.virtualFileSystem.VirtualFile; +import jakarta.annotation.Nonnull; -import javax.annotation.Nonnull; import java.util.List; /** diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/highlighter/LuaColorsPage.java b/src/main/java/com/sylvanaar/idea/lua/editor/highlighter/LuaColorsPage.java index 6efe40ca..1a553dbd 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/highlighter/LuaColorsPage.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/highlighter/LuaColorsPage.java @@ -23,10 +23,11 @@ import consulo.colorScheme.setting.ColorDescriptor; import consulo.language.editor.colorScheme.setting.ColorSettingsPage; import consulo.language.editor.highlight.SyntaxHighlighter; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.HashMap; import java.util.Map; @@ -126,8 +127,8 @@ public class LuaColorsPage implements ColorSettingsPage { @Override @Nonnull - public String getDisplayName() { - return LuaBundle.message("color.settings.name"); + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO(LuaBundle.message("color.settings.name")); } @Override diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/highlighter/LuaSyntaxHighlighter.java b/src/main/java/com/sylvanaar/idea/lua/editor/highlighter/LuaSyntaxHighlighter.java index a3ce9fc2..cb44c1e1 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/highlighter/LuaSyntaxHighlighter.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/highlighter/LuaSyntaxHighlighter.java @@ -16,16 +16,15 @@ package com.sylvanaar.idea.lua.editor.highlighter; -import consulo.codeEditor.HighlighterColors; -import consulo.colorScheme.TextAttributesKey; -import consulo.language.editor.highlight.SyntaxHighlighterBase; -import consulo.language.ast.IElementType; import com.sylvanaar.idea.lua.lang.lexer.LuaLexer; import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; import com.sylvanaar.idea.lua.lang.luadoc.parser.LuaDocElementTypes; +import consulo.codeEditor.HighlighterColors; +import consulo.colorScheme.TextAttributesKey; +import consulo.language.ast.IElementType; +import consulo.language.editor.highlight.SyntaxHighlighterBase; import consulo.language.lexer.Lexer; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/highlighter/LuaSyntaxHighlighterFactory.java b/src/main/java/com/sylvanaar/idea/lua/editor/highlighter/LuaSyntaxHighlighterFactory.java index 57cecc9d..e195dfb0 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/highlighter/LuaSyntaxHighlighterFactory.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/highlighter/LuaSyntaxHighlighterFactory.java @@ -21,8 +21,7 @@ import consulo.language.Language; import consulo.language.editor.highlight.SingleLazyInstanceSyntaxHighlighterFactory; import consulo.language.editor.highlight.SyntaxHighlighter; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/AbstractInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/AbstractInspection.java index 238f6c9c..2fd7d620 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/AbstractInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/AbstractInspection.java @@ -16,19 +16,20 @@ package com.sylvanaar.idea.lua.editor.inspections; +import com.sylvanaar.idea.lua.lang.psi.statements.LuaStatementElement; +import consulo.application.ApplicationManager; import consulo.application.util.function.Computable; import consulo.language.editor.inspection.CustomSuppressableInspectionTool; import consulo.language.editor.inspection.LocalInspectionTool; +import consulo.language.editor.inspection.SuppressionUtil; import consulo.language.editor.intention.SuppressIntentionAction; import consulo.language.editor.rawHighlight.HighlightDisplayLevel; -import consulo.language.editor.inspection.SuppressionUtil; -import consulo.application.ApplicationManager; import consulo.language.psi.PsiElement; -import com.sylvanaar.idea.lua.lang.psi.statements.LuaStatementElement; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.regex.Pattern; @@ -43,24 +44,24 @@ public abstract class AbstractInspection extends LocalInspectionTool implements private static final SuppressIntentionAction[] EMPTY_ARRAY = new SuppressIntentionAction[0]; - protected static final String ASSIGNMENT_ISSUES = "Assignment issues"; - protected static final String CONFUSING_CODE_CONSTRUCTS = "Potentially confusing code constructs"; - protected static final String CONTROL_FLOW = "Control Flow"; - protected static final String PROBABLE_BUGS = "Probable bugs"; - protected static final String ERROR_HANDLING = "Error handling"; - protected static final String GPATH = "GPath inspections"; - protected static final String METHOD_METRICS = "Method Metrics"; - protected static final String PERFORMANCE_ISSUES = "Performance issues"; - protected static final String VALIDITY_ISSUES = "Validity issues"; - protected static final String DATA_FLOW = "Data Flow Issues"; - protected static final String ANNOTATIONS_ISSUES = "Annotations verifying"; + protected static final LocalizeValue ASSIGNMENT_ISSUES = LocalizeValue.localizeTODO("Assignment issues"); + protected static final LocalizeValue CONFUSING_CODE_CONSTRUCTS = LocalizeValue.localizeTODO("Potentially confusing code constructs"); + protected static final LocalizeValue CONTROL_FLOW = LocalizeValue.localizeTODO("Control Flow"); + protected static final LocalizeValue PROBABLE_BUGS = LocalizeValue.localizeTODO("Probable bugs"); + protected static final LocalizeValue ERROR_HANDLING = LocalizeValue.localizeTODO("Error handling"); + protected static final LocalizeValue GPATH = LocalizeValue.localizeTODO("GPath inspections"); + protected static final LocalizeValue METHOD_METRICS = LocalizeValue.localizeTODO("Method Metrics"); + protected static final LocalizeValue PERFORMANCE_ISSUES = LocalizeValue.localizeTODO("Performance issues"); + protected static final LocalizeValue VALIDITY_ISSUES = LocalizeValue.localizeTODO("Validity issues"); + protected static final LocalizeValue DATA_FLOW = LocalizeValue.localizeTODO("Data Flow Issues"); + protected static final LocalizeValue ANNOTATIONS_ISSUES = LocalizeValue.localizeTODO("Annotations verifying"); private static Pattern SUPPRESS_IN_LINE_COMMENT_PATTERN = Pattern.compile("--" + SuppressionUtil.COMMON_SUPPRESS_REGEXP);; @Nonnull @Override - public String[] getGroupPath() { - return new String[]{"Lua", getGroupDisplayName()}; + public LocalizeValue[] getGroupPath() { + return new LocalizeValue[]{LocalizeValue.localizeTODO("Lua"), getGroupDisplayName()}; } private final String m_shortName = null; @@ -132,8 +133,8 @@ public PsiElement compute() { @Nls @Nonnull - public String getGroupDisplayName() { - return "Lua"; + public LocalizeValue getGroupDisplayName() { + return LocalizeValue.localizeTODO("Lua"); } // @Nullable diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/LuaFix.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/LuaFix.java index 77334a5a..a1a8b369 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/LuaFix.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/LuaFix.java @@ -16,19 +16,19 @@ package com.sylvanaar.idea.lua.editor.inspections; -import javax.annotation.Nonnull; - +import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; import consulo.codeEditor.Editor; import consulo.language.editor.inspection.LocalQuickFix; import consulo.language.editor.inspection.ProblemDescriptor; -import consulo.logging.Logger; -import consulo.project.Project; -import consulo.virtualFileSystem.ReadonlyStatusHandler; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; import consulo.language.util.IncorrectOperationException; -import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; +import consulo.localize.LocalizeValue; +import consulo.logging.Logger; +import consulo.project.Project; +import consulo.virtualFileSystem.ReadonlyStatusHandler; import consulo.virtualFileSystem.VirtualFile; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. @@ -38,7 +38,7 @@ */ public abstract class LuaFix implements LocalQuickFix { @Nonnull - public final String getText() { + public final LocalizeValue getText() { return getName(); } diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/ArrayElementZeroInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/ArrayElementZeroInspection.java index 8930a017..c34d3e0d 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/ArrayElementZeroInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/ArrayElementZeroInspection.java @@ -16,10 +16,6 @@ package com.sylvanaar.idea.lua.editor.inspections.bugs; -import javax.annotation.Nonnull; - -import consulo.language.editor.inspection.ProblemsHolder; -import consulo.language.psi.PsiElementVisitor; import com.sylvanaar.idea.lua.editor.inspections.AbstractInspection; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaLiteralExpression; @@ -27,7 +23,11 @@ import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.editor.inspection.LocalQuickFix; +import consulo.language.editor.inspection.ProblemsHolder; import consulo.language.editor.rawHighlight.HighlightDisplayLevel; +import consulo.language.psi.PsiElementVisitor; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; /** @@ -40,8 +40,8 @@ public class ArrayElementZeroInspection extends AbstractInspection { @Nls @Nonnull @Override - public String getDisplayName() { - return "Use of element 0"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("Use of element 0"); } @Override @@ -51,7 +51,7 @@ public String getStaticDescription() { @Nonnull @Override - public String getGroupDisplayName() { + public LocalizeValue getGroupDisplayName() { return PROBABLE_BUGS; } diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/GlobalCreationOutsideOfMainChunk.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/GlobalCreationOutsideOfMainChunk.java index 102663fd..44747e62 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/GlobalCreationOutsideOfMainChunk.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/GlobalCreationOutsideOfMainChunk.java @@ -16,19 +16,20 @@ package com.sylvanaar.idea.lua.editor.inspections.bugs; -import consulo.language.editor.inspection.LocalQuickFix; -import consulo.language.editor.inspection.ProblemsHolder; -import consulo.language.editor.rawHighlight.HighlightDisplayLevel; -import consulo.language.psi.util.PsiTreeUtil; import com.sylvanaar.idea.lua.editor.inspections.AbstractInspection; import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaDeclarationExpression; import com.sylvanaar.idea.lua.lang.psi.statements.LuaBlock; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaGlobal; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.editor.inspection.LocalQuickFix; +import consulo.language.editor.inspection.ProblemsHolder; +import consulo.language.editor.rawHighlight.HighlightDisplayLevel; import consulo.language.psi.PsiElementVisitor; +import consulo.language.psi.util.PsiTreeUtil; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; @@ -43,8 +44,8 @@ public class GlobalCreationOutsideOfMainChunk extends AbstractInspection { @Nls @Nonnull @Override - public String getDisplayName() { - return "Suspicious global creation"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("Suspicious global creation"); } @Override @@ -54,7 +55,7 @@ public String getStaticDescription() { @Nonnull @Override - public String getGroupDisplayName() { + public LocalizeValue getGroupDisplayName() { return PROBABLE_BUGS; } diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/GlobalSelfInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/GlobalSelfInspection.java index d6433924..f048183c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/GlobalSelfInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/GlobalSelfInspection.java @@ -16,17 +16,17 @@ package com.sylvanaar.idea.lua.editor.inspections.bugs; -import javax.annotation.Nonnull; - -import consulo.language.editor.inspection.LocalQuickFix; -import consulo.language.editor.inspection.ProblemsHolder; -import consulo.language.psi.PsiElement; -import consulo.language.psi.PsiElementVisitor; import com.sylvanaar.idea.lua.editor.inspections.AbstractInspection; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaGlobal; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.editor.inspection.LocalQuickFix; +import consulo.language.editor.inspection.ProblemsHolder; import consulo.language.editor.rawHighlight.HighlightDisplayLevel; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiElementVisitor; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; /** @@ -39,8 +39,8 @@ public class GlobalSelfInspection extends AbstractInspection { @Nls @Nonnull @Override - public String getDisplayName() { - return "Usage of global self"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("Usage of global self"); } @Override @@ -50,7 +50,7 @@ public String getStaticDescription() { @Nonnull @Override - public String getGroupDisplayName() { + public LocalizeValue getGroupDisplayName() { return PROBABLE_BUGS; } diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/LuaDivideByZeroInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/LuaDivideByZeroInspection.java index 0a84deb5..f3c6c69d 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/LuaDivideByZeroInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/LuaDivideByZeroInspection.java @@ -15,32 +15,32 @@ */ package com.sylvanaar.idea.lua.editor.inspections.bugs; -import javax.annotation.Nonnull; - +import com.sylvanaar.idea.lua.editor.inspections.AbstractInspection; +import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaBinaryExpression; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.IElementType; import consulo.language.editor.inspection.ProblemsHolder; import consulo.language.editor.rawHighlight.HighlightDisplayLevel; import consulo.language.psi.PsiElementVisitor; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; import org.jetbrains.annotations.NonNls; -import com.sylvanaar.idea.lua.editor.inspections.AbstractInspection; -import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; -import com.sylvanaar.idea.lua.lang.psi.expressions.LuaBinaryExpression; -import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; -import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; public class LuaDivideByZeroInspection extends AbstractInspection { @Nls @Nonnull - public String getGroupDisplayName() { + public LocalizeValue getGroupDisplayName() { return PROBABLE_BUGS; } @Nls @Nonnull - public String getDisplayName() { - return "Divide by zero"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("Divide by zero"); } @Override diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/ParameterSelfInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/ParameterSelfInspection.java index 64776b83..9828b87c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/ParameterSelfInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/ParameterSelfInspection.java @@ -16,18 +16,19 @@ package com.sylvanaar.idea.lua.editor.inspections.bugs; -import consulo.language.editor.inspection.ProblemsHolder; -import consulo.language.editor.rawHighlight.HighlightDisplayLevel; -import consulo.language.editor.inspection.LocalQuickFix; -import consulo.language.psi.PsiElementVisitor; import com.sylvanaar.idea.lua.editor.inspections.AbstractInspection; import com.sylvanaar.idea.lua.lang.psi.lists.LuaParameterList; import com.sylvanaar.idea.lua.lang.psi.statements.LuaFunctionDefinitionStatement; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaParameter; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.editor.inspection.LocalQuickFix; +import consulo.language.editor.inspection.ProblemsHolder; +import consulo.language.editor.rawHighlight.HighlightDisplayLevel; +import consulo.language.psi.PsiElementVisitor; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; -import javax.annotation.Nonnull; /** * Created by IntelliJ IDEA. @@ -39,8 +40,8 @@ public class ParameterSelfInspection extends AbstractInspection { @Nls @Nonnull @Override - public String getDisplayName() { - return "Parameter hides implicit self"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("Parameter hides implicit self"); } @Override @@ -50,7 +51,7 @@ public String getStaticDescription() { @Nonnull @Override - public String getGroupDisplayName() { + public LocalizeValue getGroupDisplayName() { return PROBABLE_BUGS; } diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/UnbalancedAssignmentInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/UnbalancedAssignmentInspection.java index 5a79cb4c..c660554b 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/UnbalancedAssignmentInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/bugs/UnbalancedAssignmentInspection.java @@ -16,16 +16,19 @@ package com.sylvanaar.idea.lua.editor.inspections.bugs; -import javax.annotation.Nonnull; - -import com.sylvanaar.idea.lua.editor.inspections.*; -import com.sylvanaar.idea.lua.editor.inspections.utils.*; -import com.sylvanaar.idea.lua.lang.psi.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.lists.*; -import com.sylvanaar.idea.lua.lang.psi.statements.*; -import com.sylvanaar.idea.lua.lang.psi.symbols.*; -import com.sylvanaar.idea.lua.lang.psi.visitor.*; +import com.sylvanaar.idea.lua.editor.inspections.AbstractInspection; +import com.sylvanaar.idea.lua.editor.inspections.LuaFix; +import com.sylvanaar.idea.lua.editor.inspections.utils.ExpressionUtils; +import com.sylvanaar.idea.lua.lang.psi.LuaPsiElementFactory; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaFunctionCallExpression; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaIdentifierList; +import com.sylvanaar.idea.lua.lang.psi.statements.LuaAssignmentStatement; +import com.sylvanaar.idea.lua.lang.psi.statements.LuaDeclarationStatement; +import com.sylvanaar.idea.lua.lang.psi.statements.LuaLocalDefinitionStatement; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaCompoundIdentifier; +import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.editor.inspection.LocalQuickFix; import consulo.language.editor.inspection.ProblemDescriptor; import consulo.language.editor.inspection.ProblemsHolder; @@ -33,8 +36,10 @@ import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; import consulo.language.util.IncorrectOperationException; +import consulo.localize.LocalizeValue; import consulo.project.Project; -import org.jetbrains.annotations.*; +import jakarta.annotation.Nonnull; +import org.jetbrains.annotations.Nls; /** * Created by IntelliJ IDEA. @@ -46,13 +51,13 @@ public class UnbalancedAssignmentInspection extends AbstractInspection { @Nls @Nonnull @Override - public String getDisplayName() { - return "Unbalanced Assignment"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("Unbalanced Assignment"); } @Nonnull @Override - public String getGroupDisplayName() { + public LocalizeValue getGroupDisplayName() { return PROBABLE_BUGS; } @@ -173,11 +178,11 @@ protected void doFix(Project project, ProblemDescriptor descriptor) throws Incor @Nonnull @Override - public String getName() { + public LocalizeValue getName() { if (tooManyExprs) - return "Balance by adding '_' identifiers on the left"; + return LocalizeValue.localizeTODO("Balance by adding '_' identifiers on the left"); else - return "Balance by adding nil's on the right"; + return LocalizeValue.localizeTODO("Balance by adding nil's on the right"); } } diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/CyclomaticComplexityVisitor.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/CyclomaticComplexityVisitor.java index 11885bff..0252297c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/CyclomaticComplexityVisitor.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/CyclomaticComplexityVisitor.java @@ -15,11 +15,10 @@ */ package com.sylvanaar.idea.lua.editor.inspections.metrics; -import javax.annotation.Nonnull; - import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; import com.sylvanaar.idea.lua.lang.psi.statements.*; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import jakarta.annotation.Nonnull; class CyclomaticComplexityVisitor extends LuaElementVisitor { diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/LuaMethodMetricInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/LuaMethodMetricInspection.java index b1685e4b..f042ed79 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/LuaMethodMetricInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/LuaMethodMetricInspection.java @@ -17,8 +17,8 @@ import com.sylvanaar.idea.lua.editor.inspections.AbstractInspection; - -import javax.annotation.Nonnull; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; public abstract class LuaMethodMetricInspection extends AbstractInspection { @@ -34,7 +34,7 @@ protected int getLimit() { } @Nonnull - public String getGroupDisplayName() { + public LocalizeValue getGroupDisplayName() { return METHOD_METRICS; } diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/LuaOverlyComplexMethodInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/LuaOverlyComplexMethodInspection.java index d7e667c0..406195dd 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/LuaOverlyComplexMethodInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/LuaOverlyComplexMethodInspection.java @@ -16,19 +16,19 @@ package com.sylvanaar.idea.lua.editor.inspections.metrics; -import consulo.language.editor.inspection.ProblemsHolder; import com.sylvanaar.idea.lua.lang.psi.statements.LuaBlock; import com.sylvanaar.idea.lua.lang.psi.statements.LuaFunctionDefinitionStatement; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.editor.inspection.LocalQuickFix; - -import javax.annotation.Nonnull; +import consulo.language.editor.inspection.ProblemsHolder; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; public class LuaOverlyComplexMethodInspection extends LuaMethodMetricInspection { @Nonnull - public String getDisplayName() { - return "Overly complex method"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("Overly complex method"); } diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/LuaOverlyLongMethodInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/LuaOverlyLongMethodInspection.java index 3947c743..81048cac 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/LuaOverlyLongMethodInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/LuaOverlyLongMethodInspection.java @@ -15,24 +15,24 @@ */ package com.sylvanaar.idea.lua.editor.inspections.metrics; -import javax.annotation.Nonnull; - import com.sylvanaar.idea.lua.lang.psi.statements.LuaBlock; import com.sylvanaar.idea.lua.lang.psi.statements.LuaFunctionDefinitionStatement; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.editor.inspection.LocalQuickFix; import consulo.language.editor.inspection.ProblemsHolder; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; public class LuaOverlyLongMethodInspection extends LuaMethodMetricInspection { @Nonnull - public String getDisplayName() { - return "Overly long method"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("Overly long method"); } @Nonnull - public String getGroupDisplayName() { + public LocalizeValue getGroupDisplayName() { return METHOD_METRICS; } diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/StatementCountVisitor.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/StatementCountVisitor.java index c3ae7b66..555983ae 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/StatementCountVisitor.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/metrics/StatementCountVisitor.java @@ -15,11 +15,10 @@ */ package com.sylvanaar.idea.lua.editor.inspections.metrics; -import javax.annotation.Nonnull; - import com.sylvanaar.idea.lua.lang.psi.statements.LuaFunctionDefinitionStatement; import com.sylvanaar.idea.lua.lang.psi.statements.LuaStatementElement; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import jakarta.annotation.Nonnull; class StatementCountVisitor extends LuaElementVisitor { diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/performance/RedundantInitializationInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/performance/RedundantInitializationInspection.java index aede88ca..38bb0a43 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/performance/RedundantInitializationInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/performance/RedundantInitializationInspection.java @@ -16,8 +16,6 @@ package com.sylvanaar.idea.lua.editor.inspections.performance; -import consulo.language.editor.inspection.LocalQuickFix; -import consulo.language.editor.inspection.ProblemsHolder; import com.sylvanaar.idea.lua.editor.inspections.AbstractInspection; import com.sylvanaar.idea.lua.editor.inspections.LuaFix; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; @@ -27,13 +25,16 @@ import com.sylvanaar.idea.lua.lang.psi.statements.LuaDeclarationStatement; import com.sylvanaar.idea.lua.lang.psi.statements.LuaLocalDefinitionStatement; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.editor.inspection.LocalQuickFix; import consulo.language.editor.inspection.ProblemDescriptor; +import consulo.language.editor.inspection.ProblemsHolder; import consulo.language.editor.rawHighlight.HighlightDisplayLevel; import consulo.language.psi.PsiElementVisitor; import consulo.language.util.IncorrectOperationException; +import consulo.localize.LocalizeValue; import consulo.project.Project; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; -import javax.annotation.Nonnull; /** * Created by IntelliJ IDEA. @@ -46,14 +47,14 @@ public class RedundantInitializationInspection extends AbstractInspection { @Nls @Nonnull @Override - public String getDisplayName() { - return "Redundant Initialization"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("Redundant Initialization"); } @Nonnull @Override - public String getGroupDisplayName() { + public LocalizeValue getGroupDisplayName() { return PERFORMANCE_ISSUES; } @@ -113,8 +114,8 @@ protected void doFix(Project project, ProblemDescriptor descriptor) throws Incor @Nonnull @Override - public String getName() { - return "Remove unnecessary initialization"; + public LocalizeValue getName() { + return LocalizeValue.localizeTODO("Remove unnecessary initialization"); } } } diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/performance/StringConcatenationInLoopsInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/performance/StringConcatenationInLoopsInspection.java index 04563d8d..66a35356 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/performance/StringConcatenationInLoopsInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/performance/StringConcatenationInLoopsInspection.java @@ -15,13 +15,6 @@ */ package com.sylvanaar.idea.lua.editor.inspections.performance; -import javax.annotation.Nonnull; - -import consulo.language.ast.IElementType; -import consulo.language.editor.inspection.LocalQuickFix; -import consulo.language.editor.rawHighlight.HighlightDisplayLevel; -import consulo.language.editor.inspection.ProblemsHolder; -import consulo.language.psi.PsiElement; import com.sylvanaar.idea.lua.editor.inspections.AbstractInspection; import com.sylvanaar.idea.lua.editor.inspections.utils.ControlFlowUtils; import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; @@ -31,6 +24,13 @@ import com.sylvanaar.idea.lua.lang.psi.statements.LuaAssignmentStatement; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.ast.IElementType; +import consulo.language.editor.inspection.LocalQuickFix; +import consulo.language.editor.inspection.ProblemsHolder; +import consulo.language.editor.rawHighlight.HighlightDisplayLevel; +import consulo.language.psi.PsiElement; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; public class StringConcatenationInLoopsInspection extends AbstractInspection { @@ -41,8 +41,8 @@ public class StringConcatenationInLoopsInspection extends AbstractInspection { @Override @Nonnull - public String getDisplayName() { - return "String concatenation in a loop"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("String concatenation in a loop"); } // @Override @@ -53,7 +53,7 @@ protected String buildErrorString(Object... infos) { @Nonnull @Override - public String getGroupDisplayName() { + public LocalizeValue getGroupDisplayName() { return PERFORMANCE_ISSUES; } diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/unassignedVariable/UnassignedVariableAccessInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/unassignedVariable/UnassignedVariableAccessInspection.java index 580064c9..1b147751 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/unassignedVariable/UnassignedVariableAccessInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/unassignedVariable/UnassignedVariableAccessInspection.java @@ -15,13 +15,6 @@ */ package com.sylvanaar.idea.lua.editor.inspections.unassignedVariable; -import javax.annotation.Nonnull; - -import consulo.language.editor.inspection.UnfairLocalInspectionTool; -import consulo.language.editor.rawHighlight.HighlightDisplayLevel; -import consulo.language.editor.inspection.ProblemHighlightType; -import consulo.language.editor.inspection.ProblemsHolder; -import consulo.language.psi.PsiElement; import com.sylvanaar.idea.lua.editor.inspections.AbstractInspection; import com.sylvanaar.idea.lua.lang.psi.LuaControlFlowOwner; import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; @@ -31,8 +24,15 @@ import com.sylvanaar.idea.lua.lang.psi.controlFlow.ReadWriteVariableInstruction; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaGlobal; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.editor.inspection.ProblemHighlightType; +import consulo.language.editor.inspection.ProblemsHolder; +import consulo.language.editor.inspection.UnfairLocalInspectionTool; +import consulo.language.editor.rawHighlight.HighlightDisplayLevel; +import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; import consulo.language.psi.PsiFile; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; /** @@ -43,8 +43,8 @@ public class UnassignedVariableAccessInspection extends AbstractInspection impl @Nls @Nonnull @Override - public String getDisplayName() { - return "Variable not assigned"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("Variable not assigned"); } @Override @@ -54,7 +54,7 @@ public String getStaticDescription() { @Nonnull @Override - public String getGroupDisplayName() { + public LocalizeValue getGroupDisplayName() { return PROBABLE_BUGS; } diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/usage/UnusedDefInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/usage/UnusedDefInspection.java index 81371541..a538c856 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/usage/UnusedDefInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/usage/UnusedDefInspection.java @@ -15,14 +15,6 @@ */ package com.sylvanaar.idea.lua.editor.inspections.usage; -import consulo.language.editor.inspection.ProblemsHolder; -import consulo.language.editor.inspection.UnfairLocalInspectionTool; -import consulo.language.psi.PsiElementVisitor; -import consulo.language.psi.PsiReference; -import consulo.logging.Logger; -import consulo.application.progress.ProgressIndicatorProvider; -import consulo.language.psi.PsiElement; -import consulo.language.psi.PsiFile; import com.sylvanaar.idea.lua.editor.inspections.AbstractInspection; import com.sylvanaar.idea.lua.lang.psi.LuaControlFlowOwner; import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; @@ -37,15 +29,24 @@ import com.sylvanaar.idea.lua.lang.psi.symbols.LuaParameter; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.application.progress.ProgressIndicatorProvider; import consulo.language.editor.inspection.ProblemHighlightType; +import consulo.language.editor.inspection.ProblemsHolder; +import consulo.language.editor.inspection.UnfairLocalInspectionTool; import consulo.language.editor.rawHighlight.HighlightDisplayLevel; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiElementVisitor; +import consulo.language.psi.PsiFile; +import consulo.language.psi.PsiReference; +import consulo.localize.LocalizeValue; +import consulo.logging.Logger; import consulo.util.collection.primitive.ints.IntObjConsumer; import consulo.util.collection.primitive.ints.IntObjectMap; import consulo.util.collection.primitive.ints.IntSet; import consulo.util.collection.primitive.ints.IntSets; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.Nls; -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.function.IntConsumer; @@ -64,7 +65,7 @@ public String getStaticDescription() { @Override @Nls @Nonnull - public String getGroupDisplayName() { + public LocalizeValue getGroupDisplayName() { return DATA_FLOW; } @@ -77,8 +78,8 @@ public HighlightDisplayLevel getDefaultLevel() { @Override @Nls @Nonnull - public String getDisplayName() { - return "Unused Assignment"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("Unused Assignment"); } @Nonnull diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/utils/BoolUtils.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/utils/BoolUtils.java index 821fce4a..3657f267 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/utils/BoolUtils.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/utils/BoolUtils.java @@ -15,14 +15,13 @@ */ package com.sylvanaar.idea.lua.editor.inspections.utils; -import javax.annotation.Nonnull; - import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaConditionalExpression; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaUnaryExpression; import consulo.language.ast.IElementType; import consulo.util.lang.ObjectUtil; +import jakarta.annotation.Nonnull; public class BoolUtils { private static Object UNKNOWN = new Object(); diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/utils/ControlFlowUtils.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/utils/ControlFlowUtils.java index 76dc2dc8..49eaf07f 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/utils/ControlFlowUtils.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/utils/ControlFlowUtils.java @@ -15,16 +15,13 @@ */ package com.sylvanaar.idea.lua.editor.inspections.utils; -import javax.annotation.Nonnull; - -import consulo.language.psi.util.PsiTreeUtil; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaConditionalExpression; import com.sylvanaar.idea.lua.lang.psi.statements.*; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; - -import javax.annotation.Nullable; - +import consulo.language.psi.util.PsiTreeUtil; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; @SuppressWarnings({"OverlyComplexClass"}) public class ControlFlowUtils { diff --git a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/validity/LuaUnreachableStatementInspection.java b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/validity/LuaUnreachableStatementInspection.java index ae856b39..807d385a 100644 --- a/src/main/java/com/sylvanaar/idea/lua/editor/inspections/validity/LuaUnreachableStatementInspection.java +++ b/src/main/java/com/sylvanaar/idea/lua/editor/inspections/validity/LuaUnreachableStatementInspection.java @@ -15,34 +15,32 @@ */ package com.sylvanaar.idea.lua.editor.inspections.validity; -import javax.annotation.Nonnull; - -import consulo.language.editor.inspection.ProblemsHolder; import com.sylvanaar.idea.lua.editor.inspections.AbstractInspection; import com.sylvanaar.idea.lua.editor.inspections.utils.ControlFlowUtils; import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; import com.sylvanaar.idea.lua.lang.psi.statements.LuaStatementElement; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.editor.inspection.ProblemHighlightType; +import consulo.language.editor.inspection.ProblemsHolder; import consulo.language.psi.PsiElementVisitor; import consulo.language.psi.PsiFile; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.Nls; -import javax.annotation.Nullable; - - public class LuaUnreachableStatementInspection extends AbstractInspection { @Nls @Nonnull - public String getGroupDisplayName() { + public LocalizeValue getGroupDisplayName() { return VALIDITY_ISSUES; } @Nls @Nonnull - public String getDisplayName() { - return "Unreachable Statement"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("Unreachable Statement"); } @Nullable diff --git a/src/main/java/com/sylvanaar/idea/lua/findUsages/LuaAliasedElementSearcher.java b/src/main/java/com/sylvanaar/idea/lua/findUsages/LuaAliasedElementSearcher.java index 69c932bb..25e11f6f 100644 --- a/src/main/java/com/sylvanaar/idea/lua/findUsages/LuaAliasedElementSearcher.java +++ b/src/main/java/com/sylvanaar/idea/lua/findUsages/LuaAliasedElementSearcher.java @@ -15,7 +15,6 @@ */ package com.sylvanaar.idea.lua.findUsages; -import consulo.application.util.function.Processor; import consulo.content.scope.SearchScope; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiNamedElement; @@ -25,9 +24,10 @@ import consulo.language.psi.search.SearchSession; import consulo.project.util.query.QueryExecutorBase; import consulo.util.lang.StringUtil; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import java.util.function.Predicate; public class LuaAliasedElementSearcher extends QueryExecutorBase { @@ -36,7 +36,7 @@ public LuaAliasedElementSearcher() { } @Override - public void processQuery(@Nonnull ReferencesSearch.SearchParameters parameters, @Nonnull Processor consumer) { + public void processQuery(@Nonnull ReferencesSearch.SearchParameters parameters, @Nonnull Predicate consumer) { final PsiElement target = parameters.getElementToSearch(); if (!(target instanceof PsiNamedElement)) { return; @@ -66,7 +66,7 @@ private static class MyProcessor extends consulo.language.psi.search.RequestResu } @Override - public boolean processTextOccurrence(final PsiElement element, int offsetInElement, Processor consumer) { + public boolean processTextOccurrence(final PsiElement element, int offsetInElement, Predicate consumer) { String alias = element.getText(); if (alias == null) { return true; diff --git a/src/main/java/com/sylvanaar/idea/lua/findUsages/LuaFindUsagesProvider.java b/src/main/java/com/sylvanaar/idea/lua/findUsages/LuaFindUsagesProvider.java index 4caab6f8..6bb34198 100644 --- a/src/main/java/com/sylvanaar/idea/lua/findUsages/LuaFindUsagesProvider.java +++ b/src/main/java/com/sylvanaar/idea/lua/findUsages/LuaFindUsagesProvider.java @@ -31,9 +31,7 @@ import consulo.language.findUsage.FindUsagesProvider; import consulo.language.psi.PsiElement; import consulo.util.lang.StringUtil; - -import javax.annotation.Nonnull; - +import jakarta.annotation.Nonnull; /** * @author ven diff --git a/src/main/java/com/sylvanaar/idea/lua/intentions/base/Intention.java b/src/main/java/com/sylvanaar/idea/lua/intentions/base/Intention.java index 6bb26a5d..b7e0cc87 100644 --- a/src/main/java/com/sylvanaar/idea/lua/intentions/base/Intention.java +++ b/src/main/java/com/sylvanaar/idea/lua/intentions/base/Intention.java @@ -15,24 +15,21 @@ */ package com.sylvanaar.idea.lua.intentions.base; -import javax.annotation.Nonnull; - +import com.sylvanaar.idea.lua.intentions.LuaIntentionsBundle; +import com.sylvanaar.idea.lua.intentions.utils.BoolUtils; +import com.sylvanaar.idea.lua.intentions.utils.QuickfixUtil; +import com.sylvanaar.idea.lua.lang.psi.LuaPsiElementFactory; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import consulo.codeEditor.CaretModel; import consulo.codeEditor.Editor; import consulo.language.editor.intention.IntentionAction; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; import consulo.language.util.IncorrectOperationException; -import com.sylvanaar.idea.lua.intentions.utils.QuickfixUtil; -import com.sylvanaar.idea.lua.intentions.LuaIntentionsBundle; -import com.sylvanaar.idea.lua.intentions.utils.BoolUtils; -import com.sylvanaar.idea.lua.lang.psi.LuaPsiElementFactory; -import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import consulo.localize.LocalizeValue; import consulo.project.Project; - -import javax.annotation.Nullable; - - +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; public abstract class Intention implements IntentionAction { private final PsiElementPredicate predicate; @@ -136,8 +133,8 @@ private String getPrefix() { } @Nonnull - public String getText() { - return LuaIntentionsBundle.message(getPrefix() + ".name"); + public LocalizeValue getText() { + return LocalizeValue.localizeTODO(LuaIntentionsBundle.message(getPrefix() + ".name")); } @Nonnull diff --git a/src/main/java/com/sylvanaar/idea/lua/intentions/base/IntentionUtils.java b/src/main/java/com/sylvanaar/idea/lua/intentions/base/IntentionUtils.java index 19db7d28..31eb0cf8 100644 --- a/src/main/java/com/sylvanaar/idea/lua/intentions/base/IntentionUtils.java +++ b/src/main/java/com/sylvanaar/idea/lua/intentions/base/IntentionUtils.java @@ -15,15 +15,13 @@ */ package com.sylvanaar.idea.lua.intentions.base; -import javax.annotation.Nonnull; - -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElementFactory; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.statements.LuaStatementElement; +import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; - /** * User: Dmitry.Krasilschikov * Date: 13.11.2007 diff --git a/src/main/java/com/sylvanaar/idea/lua/intentions/base/MutablyNamedIntention.java b/src/main/java/com/sylvanaar/idea/lua/intentions/base/MutablyNamedIntention.java index a7d0b8ec..8a5693f0 100644 --- a/src/main/java/com/sylvanaar/idea/lua/intentions/base/MutablyNamedIntention.java +++ b/src/main/java/com/sylvanaar/idea/lua/intentions/base/MutablyNamedIntention.java @@ -15,12 +15,12 @@ */ package com.sylvanaar.idea.lua.intentions.base; -import javax.annotation.Nonnull; - -import consulo.language.psi.PsiFile; +import consulo.codeEditor.Editor; import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiFile; +import consulo.localize.LocalizeValue; import consulo.project.Project; -import consulo.codeEditor.Editor; +import jakarta.annotation.Nonnull; public abstract class MutablyNamedIntention extends Intention { private String text = null; @@ -28,8 +28,8 @@ public abstract class MutablyNamedIntention extends Intention { protected abstract String getTextForElement(PsiElement element); @Nonnull - public String getText() { - return text; + public LocalizeValue getText() { + return LocalizeValue.ofNullable(text); } public boolean isAvailable(@Nonnull Project project, Editor editor, PsiFile file) { diff --git a/src/main/java/com/sylvanaar/idea/lua/intentions/comments/ChangeToCStyleCommentIntention.java b/src/main/java/com/sylvanaar/idea/lua/intentions/comments/ChangeToCStyleCommentIntention.java index f3e99258..00a4ee18 100644 --- a/src/main/java/com/sylvanaar/idea/lua/intentions/comments/ChangeToCStyleCommentIntention.java +++ b/src/main/java/com/sylvanaar/idea/lua/intentions/comments/ChangeToCStyleCommentIntention.java @@ -15,21 +15,20 @@ */ package com.sylvanaar.idea.lua.intentions.comments; -import consulo.language.ast.IElementType; -import consulo.language.psi.PsiComment; -import consulo.language.psi.PsiElement; -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.intentions.base.Intention; import com.sylvanaar.idea.lua.intentions.base.PsiElementPredicate; import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElementFactory; -import javax.annotation.Nonnull; +import consulo.language.ast.IElementType; +import consulo.language.psi.PsiComment; +import consulo.language.psi.PsiElement; +import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.List; -import javax.annotation.Nullable; - public class ChangeToCStyleCommentIntention extends Intention { diff --git a/src/main/java/com/sylvanaar/idea/lua/intentions/comments/ChangeToEndOfLineCommentIntention.java b/src/main/java/com/sylvanaar/idea/lua/intentions/comments/ChangeToEndOfLineCommentIntention.java index de0fa8af..45e588ad 100644 --- a/src/main/java/com/sylvanaar/idea/lua/intentions/comments/ChangeToEndOfLineCommentIntention.java +++ b/src/main/java/com/sylvanaar/idea/lua/intentions/comments/ChangeToEndOfLineCommentIntention.java @@ -15,15 +15,13 @@ */ package com.sylvanaar.idea.lua.intentions.comments; -import consulo.language.psi.PsiComment; -import consulo.language.psi.PsiElement; import com.sylvanaar.idea.lua.intentions.base.Intention; import com.sylvanaar.idea.lua.intentions.base.PsiElementPredicate; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElementFactory; +import consulo.language.psi.PsiComment; +import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; - -import javax.annotation.Nonnull; - +import jakarta.annotation.Nonnull; public class ChangeToEndOfLineCommentIntention extends Intention { diff --git a/src/main/java/com/sylvanaar/idea/lua/intentions/control/FlipComparisonIntention.java b/src/main/java/com/sylvanaar/idea/lua/intentions/control/FlipComparisonIntention.java index a1619882..c6ded25f 100644 --- a/src/main/java/com/sylvanaar/idea/lua/intentions/control/FlipComparisonIntention.java +++ b/src/main/java/com/sylvanaar/idea/lua/intentions/control/FlipComparisonIntention.java @@ -15,10 +15,6 @@ */ package com.sylvanaar.idea.lua.intentions.control; -import javax.annotation.Nonnull; - -import consulo.language.ast.IElementType; -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.intentions.LuaIntentionsBundle; import com.sylvanaar.idea.lua.intentions.base.IntentionUtils; import com.sylvanaar.idea.lua.intentions.base.MutablyNamedIntention; @@ -26,8 +22,10 @@ import com.sylvanaar.idea.lua.intentions.utils.ComparisonUtils; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaBinaryExpression; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; - +import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; public class FlipComparisonIntention extends MutablyNamedIntention { protected String getTextForElement(PsiElement element) { diff --git a/src/main/java/com/sylvanaar/idea/lua/intentions/control/FlipConjunctionIntention.java b/src/main/java/com/sylvanaar/idea/lua/intentions/control/FlipConjunctionIntention.java index ac301bc5..54603583 100644 --- a/src/main/java/com/sylvanaar/idea/lua/intentions/control/FlipConjunctionIntention.java +++ b/src/main/java/com/sylvanaar/idea/lua/intentions/control/FlipConjunctionIntention.java @@ -15,9 +15,6 @@ */ package com.sylvanaar.idea.lua.intentions.control; -import javax.annotation.Nonnull; - -import consulo.language.ast.IElementType; import com.sylvanaar.idea.lua.intentions.LuaIntentionsBundle; import com.sylvanaar.idea.lua.intentions.base.IntentionUtils; import com.sylvanaar.idea.lua.intentions.base.MutablyNamedIntention; @@ -25,9 +22,10 @@ import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaBinaryExpression; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; - +import jakarta.annotation.Nonnull; public class FlipConjunctionIntention extends MutablyNamedIntention { protected String getTextForElement(PsiElement element) { diff --git a/src/main/java/com/sylvanaar/idea/lua/intentions/control/NegateComparisonIntention.java b/src/main/java/com/sylvanaar/idea/lua/intentions/control/NegateComparisonIntention.java index 1deafaf1..0b9e76c0 100644 --- a/src/main/java/com/sylvanaar/idea/lua/intentions/control/NegateComparisonIntention.java +++ b/src/main/java/com/sylvanaar/idea/lua/intentions/control/NegateComparisonIntention.java @@ -15,7 +15,6 @@ */ package com.sylvanaar.idea.lua.intentions.control; -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.intentions.LuaIntentionsBundle; import com.sylvanaar.idea.lua.intentions.base.MutablyNamedIntention; import com.sylvanaar.idea.lua.intentions.base.PsiElementPredicate; @@ -24,9 +23,8 @@ import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; - -import javax.annotation.Nonnull; - +import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; public class NegateComparisonIntention extends MutablyNamedIntention { protected String getTextForElement(PsiElement element) { diff --git a/src/main/java/com/sylvanaar/idea/lua/intentions/style/UseStringColonCallIntention.java b/src/main/java/com/sylvanaar/idea/lua/intentions/style/UseStringColonCallIntention.java index ab2db18a..9b1f8c6e 100644 --- a/src/main/java/com/sylvanaar/idea/lua/intentions/style/UseStringColonCallIntention.java +++ b/src/main/java/com/sylvanaar/idea/lua/intentions/style/UseStringColonCallIntention.java @@ -16,20 +16,19 @@ package com.sylvanaar.idea.lua.intentions.style; -import consulo.language.psi.PsiElement; -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.intentions.LuaIntentionsBundle; import com.sylvanaar.idea.lua.intentions.base.MutablyNamedIntention; import com.sylvanaar.idea.lua.intentions.base.PsiElementPredicate; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; -import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaFunctionCallExpression; import com.sylvanaar.idea.lua.lang.psi.impl.expressions.LuaStringLiteralExpressionImpl; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; import consulo.document.Document; import consulo.language.psi.PsiDocumentManager; - -import javax.annotation.Nonnull; +import consulo.language.psi.PsiElement; +import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; import java.util.List; diff --git a/src/main/java/com/sylvanaar/idea/lua/intentions/utils/BoolUtils.java b/src/main/java/com/sylvanaar/idea/lua/intentions/utils/BoolUtils.java index 3147ab22..9c078212 100644 --- a/src/main/java/com/sylvanaar/idea/lua/intentions/utils/BoolUtils.java +++ b/src/main/java/com/sylvanaar/idea/lua/intentions/utils/BoolUtils.java @@ -15,12 +15,11 @@ */ package com.sylvanaar.idea.lua.intentions.utils; -import consulo.language.ast.IElementType; import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; import com.sylvanaar.idea.lua.lang.psi.expressions.*; +import consulo.language.ast.IElementType; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nullable; - public class BoolUtils { private BoolUtils() { diff --git a/src/main/java/com/sylvanaar/idea/lua/intentions/utils/ParenthesesUtils.java b/src/main/java/com/sylvanaar/idea/lua/intentions/utils/ParenthesesUtils.java index 9ffffa2e..75b0cf19 100644 --- a/src/main/java/com/sylvanaar/idea/lua/intentions/utils/ParenthesesUtils.java +++ b/src/main/java/com/sylvanaar/idea/lua/intentions/utils/ParenthesesUtils.java @@ -15,14 +15,14 @@ */ package com.sylvanaar.idea.lua.intentions.utils; -import consulo.language.ast.IElementType; import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; import com.sylvanaar.idea.lua.lang.psi.expressions.*; import com.sylvanaar.idea.lua.lang.psi.statements.LuaAssignmentStatement; import com.sylvanaar.idea.lua.lang.psi.statements.LuaFunctionCallStatement; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import consulo.language.ast.IElementType; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/sylvanaar/idea/lua/intentions/utils/QuickfixUtil.java b/src/main/java/com/sylvanaar/idea/lua/intentions/utils/QuickfixUtil.java index 05011980..9e10f4e9 100644 --- a/src/main/java/com/sylvanaar/idea/lua/intentions/utils/QuickfixUtil.java +++ b/src/main/java/com/sylvanaar/idea/lua/intentions/utils/QuickfixUtil.java @@ -27,8 +27,7 @@ import consulo.project.Project; import consulo.virtualFileSystem.ReadonlyStatusHandler; import consulo.virtualFileSystem.VirtualFile; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * User: Dmitry.Krasilschikov diff --git a/src/main/java/com/sylvanaar/idea/lua/intentions/utils/TreeUtil.java b/src/main/java/com/sylvanaar/idea/lua/intentions/utils/TreeUtil.java index b922457a..8f28ce71 100644 --- a/src/main/java/com/sylvanaar/idea/lua/intentions/utils/TreeUtil.java +++ b/src/main/java/com/sylvanaar/idea/lua/intentions/utils/TreeUtil.java @@ -15,8 +15,8 @@ */ package com.sylvanaar.idea.lua.intentions.utils; -import javax.annotation.Nullable; import consulo.language.psi.PsiElement; +import jakarta.annotation.Nullable; public class TreeUtil { private TreeUtil() { diff --git a/src/main/java/com/sylvanaar/idea/lua/kahlua/KahLuaInterpreterWindowFactory.java b/src/main/java/com/sylvanaar/idea/lua/kahlua/KahLuaInterpreterWindowFactory.java index c832bb5a..2b568adc 100644 --- a/src/main/java/com/sylvanaar/idea/lua/kahlua/KahLuaInterpreterWindowFactory.java +++ b/src/main/java/com/sylvanaar/idea/lua/kahlua/KahLuaInterpreterWindowFactory.java @@ -25,13 +25,12 @@ import consulo.ui.ex.toolWindow.ToolWindowAnchor; import consulo.ui.image.Image; import jakarta.annotation.Nonnull; -import se.krka.kahlua.converter.KahluaConverterManager; -import se.krka.kahlua.converter.KahluaEnumConverter; -import se.krka.kahlua.converter.KahluaNumberConverter; -import se.krka.kahlua.converter.KahluaTableConverter; -import se.krka.kahlua.j2se.J2SEPlatform; -import se.krka.kahlua.vm.KahluaTable; -import se.krka.kahlua.vm.Platform; + +//import se.krka.kahlua.converter.KahluaConverterManager; +//import se.krka.kahlua.converter.KahluaEnumConverter; +//import se.krka.kahlua.converter.KahluaNumberConverter; +//import se.krka.kahlua.converter.KahluaTableConverter; +//import se.krka.kahlua.j2se.J2SEPlatform; /** * Created by IntelliJ IDEA. @@ -53,30 +52,30 @@ public String getId() { @RequiredUIAccess @Override public void createToolWindowContent(Project project, ToolWindow toolWindow) { - final Platform platform = new J2SEPlatform(); - final KahluaTable env = platform.newEnvironment(); - - KahluaConverterManager manager = new KahluaConverterManager(); - KahluaNumberConverter.install(manager); - KahluaEnumConverter.install(manager); - new KahluaTableConverter(platform).install(manager); - - KahluaTable staticBase = platform.newTable(); - env.rawset("Java", staticBase); - - KahluaInterpreter shell = new KahluaInterpreter(platform, env); - - INSTANCE = shell; - - shell.getTerminal().appendInfo("Useful shortcuts:\n" + - "Ctrl-enter -- execute script\n" + - "Ctrl-space -- autocomplete global variables\n" + - "Ctrl-p -- show definition (if available)\n" + - "Ctrl-up/down -- browse input history\n" + - "" - ); +// final Platform platform = new J2SEPlatform(); +// final KahluaTable env = platform.newEnvironment(); +// +// KahluaConverterManager manager = new KahluaConverterManager(); +// KahluaNumberConverter.install(manager); +// KahluaEnumConverter.install(manager); +// new KahluaTableConverter(platform).install(manager); +// +// KahluaTable staticBase = platform.newTable(); +// env.rawset("Java", staticBase); +// +// KahluaInterpreter shell = new KahluaInterpreter(platform, env); - toolWindow.getComponent().add(shell); +// INSTANCE = shell; +// +// shell.getTerminal().appendInfo("Useful shortcuts:\n" + +// "Ctrl-enter -- execute script\n" + +// "Ctrl-space -- autocomplete global variables\n" + +// "Ctrl-p -- show definition (if available)\n" + +// "Ctrl-up/down -- browse input history\n" + +// "" +// ); +// +// toolWindow.getComponent().add(shell); } @Nonnull diff --git a/src/main/java/com/sylvanaar/idea/lua/kahlua/KahluaInterpreter.java b/src/main/java/com/sylvanaar/idea/lua/kahlua/KahluaInterpreter.java index d611fcfd..c6dc5db2 100644 --- a/src/main/java/com/sylvanaar/idea/lua/kahlua/KahluaInterpreter.java +++ b/src/main/java/com/sylvanaar/idea/lua/kahlua/KahluaInterpreter.java @@ -16,10 +16,18 @@ package com.sylvanaar.idea.lua.kahlua; -import java.awt.BorderLayout; -import java.awt.Color; -import java.awt.Dimension; -import java.awt.Toolkit; +import jsyntaxpane.lexers.LuaLexer; +import se.krka.kahlua.j2se.interpreter.History; +import se.krka.kahlua.j2se.interpreter.InputTerminal; +import se.krka.kahlua.j2se.interpreter.OutputTerminal; +import se.krka.kahlua.j2se.interpreter.autocomplete.AutoComplete; +import se.krka.kahlua.j2se.interpreter.jsyntax.JSyntaxUtil; +import se.krka.kahlua.j2se.interpreter.jsyntax.KahluaKit; +import se.krka.kahlua.luaj.compiler.LuaCompiler; +import se.krka.kahlua.vm.*; + +import javax.swing.*; +import java.awt.*; import java.awt.event.ComponentEvent; import java.awt.event.ComponentListener; import java.awt.event.KeyEvent; @@ -29,27 +37,10 @@ import java.util.concurrent.Executors; import java.util.concurrent.Future; -import javax.swing.JLabel; -import javax.swing.JPanel; - -import jsyntaxpane.lexers.LuaLexer; -import se.krka.kahlua.converter.KahluaConverterManager; -import se.krka.kahlua.integration.LuaCaller; -import se.krka.kahlua.integration.LuaReturn; -import se.krka.kahlua.integration.expose.LuaJavaClassExposer; -import se.krka.kahlua.j2se.interpreter.History; -import se.krka.kahlua.j2se.interpreter.InputTerminal; -import se.krka.kahlua.j2se.interpreter.OutputTerminal; -import se.krka.kahlua.j2se.interpreter.autocomplete.AutoComplete; -import se.krka.kahlua.j2se.interpreter.jsyntax.JSyntaxUtil; -import se.krka.kahlua.j2se.interpreter.jsyntax.KahluaKit; -import se.krka.kahlua.luaj.compiler.LuaCompiler; -import se.krka.kahlua.vm.KahluaException; -import se.krka.kahlua.vm.KahluaTable; -import se.krka.kahlua.vm.KahluaThread; -import se.krka.kahlua.vm.KahluaUtil; -import se.krka.kahlua.vm.LuaClosure; -import se.krka.kahlua.vm.Platform; +//import se.krka.kahlua.converter.KahluaConverterManager; +//import se.krka.kahlua.integration.LuaCaller; +//import se.krka.kahlua.integration.LuaReturn; +//import se.krka.kahlua.integration.expose.LuaJavaClassExposer; /** * Created by IntelliJ IDEA. @@ -67,17 +58,17 @@ public class KahluaInterpreter extends JPanel { private final ExecutorService executors = Executors.newSingleThreadExecutor(Executors.defaultThreadFactory()); private Future future; - final KahluaConverterManager manager = new KahluaConverterManager(); - final LuaCaller caller = new LuaCaller(manager); - final LuaJavaClassExposer exposer; +// final KahluaConverterManager manager = new KahluaConverterManager(); +// final LuaCaller caller = new LuaCaller(manager); +// final LuaJavaClassExposer exposer; public KahluaInterpreter(Platform platform, KahluaTable env) { super(new BorderLayout()); JSyntaxUtil.setup(); - exposer = new LuaJavaClassExposer(manager, platform, env); - exposer.exposeGlobalFunctions(this); +// exposer = new LuaJavaClassExposer(manager, platform, env); +// exposer.exposeGlobalFunctions(this); final InputTerminal input = new InputTerminal(Color.BLACK); @@ -184,16 +175,16 @@ public void run() { status.setText("[running...]"); try { LuaClosure luaClosure = smartCompile(text); - LuaReturn result = caller.protectedCall(thread, luaClosure); - if (result.isSuccess()) { - for (Object o : result) { - terminal.appendOutput(KahluaUtil.tostring(o, thread)+"\n"); - } - } else { - terminal.appendError(result.getErrorString()+"\n"); - terminal.appendError(result.getLuaStackTrace()+"\n"); - result.getJavaException().printStackTrace(System.err); - } +// LuaReturn result = caller.protectedCall(thread, luaClosure); +// if (result.isSuccess()) { +// for (Object o : result) { +// terminal.appendOutput(KahluaUtil.tostring(o, thread)+"\n"); +// } +// } else { +// terminal.appendError(result.getErrorString()+"\n"); +// terminal.appendError(result.getLuaStackTrace()+"\n"); +// result.getJavaException().printStackTrace(System.err); +// } } catch (IOException e) { e.printStackTrace(terminal.getPrintStream()); } catch (RuntimeException e) { diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/LuaBraceMatcher.java b/src/main/java/com/sylvanaar/idea/lua/lang/LuaBraceMatcher.java index 045d4696..2633ddb2 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/LuaBraceMatcher.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/LuaBraceMatcher.java @@ -21,9 +21,8 @@ import consulo.language.Language; import consulo.language.PairedBraceMatcher; import consulo.language.ast.IElementType; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import static com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes.*; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/LuaEnterHandlerDelegate.java b/src/main/java/com/sylvanaar/idea/lua/lang/LuaEnterHandlerDelegate.java index bcb76858..d5821b3e 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/LuaEnterHandlerDelegate.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/LuaEnterHandlerDelegate.java @@ -31,9 +31,8 @@ import consulo.language.psi.PsiFile; import consulo.language.psi.PsiWhiteSpace; import consulo.language.util.IncorrectOperationException; -import consulo.util.lang.ref.Ref; - -import javax.annotation.Nonnull; +import consulo.util.lang.ref.SimpleReference; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. @@ -44,7 +43,7 @@ @ExtensionImpl public class LuaEnterHandlerDelegate implements EnterHandlerDelegate { @Override - public Result preprocessEnter(PsiFile file, Editor editor, consulo.util.lang.ref.Ref caretOffsetRef, Ref caretAdvance, + public Result preprocessEnter(PsiFile file, Editor editor, consulo.util.lang.ref.SimpleReference caretOffsetRef, SimpleReference caretAdvance, DataContext dataContext, EditorActionHandler originalHandler) { if (!(file instanceof LuaPsiFile && CodeInsightSettings.getInstance().SMART_INDENT_ON_ENTER)) { return Result.Continue; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/LuaFoldingBuilder.java b/src/main/java/com/sylvanaar/idea/lua/lang/LuaFoldingBuilder.java index 79925b51..0e7677a1 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/LuaFoldingBuilder.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/LuaFoldingBuilder.java @@ -31,8 +31,8 @@ import consulo.language.editor.folding.FoldingBuilder; import consulo.language.editor.folding.FoldingDescriptor; import consulo.language.psi.PsiElement; +import jakarta.annotation.Nonnull; -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/documentor/KahluaPluginDocumentationProvider.java b/src/main/java/com/sylvanaar/idea/lua/lang/documentor/KahluaPluginDocumentationProvider.java index e525ef64..aaf2e489 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/documentor/KahluaPluginDocumentationProvider.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/documentor/KahluaPluginDocumentationProvider.java @@ -30,31 +30,27 @@ import consulo.language.psi.PsiFile; import consulo.language.psi.PsiManager; import consulo.logging.Logger; -import consulo.util.io.CharsetToolkit; import consulo.util.io.ClassPathUtil; import consulo.virtualFileSystem.VirtualFile; import consulo.virtualFileSystem.VirtualFileManager; import consulo.virtualFileSystem.archive.ArchiveVfsUtil; import consulo.virtualFileSystem.util.VirtualFileUtil; -import se.krka.kahlua.converter.KahluaConverterManager; -import se.krka.kahlua.integration.LuaCaller; -import se.krka.kahlua.integration.LuaReturn; -import se.krka.kahlua.integration.annotations.LuaMethod; -import se.krka.kahlua.integration.expose.LuaJavaClassExposer; -import se.krka.kahlua.j2se.J2SEPlatform; -import se.krka.kahlua.luaj.compiler.LuaCompiler; -import se.krka.kahlua.vm.KahluaTable; -import se.krka.kahlua.vm.KahluaThread; -import se.krka.kahlua.vm.LuaClosure; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; + import java.io.IOException; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +//import se.krka.kahlua.converter.KahluaConverterManager; +//import se.krka.kahlua.integration.LuaCaller; +//import se.krka.kahlua.integration.LuaReturn; +//import se.krka.kahlua.integration.annotations.LuaMethod; +//import se.krka.kahlua.integration.expose.LuaJavaClassExposer; +//import se.krka.kahlua.j2se.J2SEPlatform; + /** * Created by IntelliJ IDEA. @@ -64,10 +60,10 @@ */ @ExtensionImpl(id = "lua.kahlua", order = "before lua.doc") public class KahluaPluginDocumentationProvider implements LanguageDocumentationProvider { - private static final KahluaConverterManager converterManager = new KahluaConverterManager(); - private static final J2SEPlatform platform = new J2SEPlatform(); +// private static final KahluaConverterManager converterManager = new KahluaConverterManager(); +// private static final J2SEPlatform platform = new J2SEPlatform(); - private static final LuaCaller caller = new LuaCaller(converterManager); +// private static final LuaCaller caller = new LuaCaller(converterManager); private final Object VMLock = new Object(); @@ -86,30 +82,30 @@ public Language getLanguage() { private class ScriptEnvironment { - KahluaTable env = platform.newEnvironment(); - final KahluaThread thread = new KahluaThread(platform, env); - final LuaJavaClassExposer exposer = new LuaJavaClassExposer(converterManager, platform, env); +// KahluaTable env = platform.newEnvironment(); +// final KahluaThread thread = new KahluaThread(platform, env); +// final LuaJavaClassExposer exposer = new LuaJavaClassExposer(converterManager, platform, env); } - @LuaMethod(name = "log", global = true) +// @LuaMethod(name = "log", global = true) public void luaLog(String msg) { log.info(msg); } - @LuaMethod(name = "disableCache", global = true) +// @LuaMethod(name = "disableCache", global = true) public void clearCaches() { scriptEnvironmentMap.clear(); } - @LuaMethod(name = "fetchURL", global = true) +// @LuaMethod(name = "fetchURL", global = true) public String fetchURL(String url) { UrlUtil.UrlFetcher fetcher = new UrlUtil.UrlFetcher(url); fetcher.run(); return fetcher.getData(); } - @LuaMethod(name = "getBaseJarUrl", global = true) +// @LuaMethod(name = "getBaseJarUrl", global = true) public String getBaseJarUrl() { String url = VirtualFileUtil.pathToUrl(ClassPathUtil.getJarPathForClass(LuaPsiFile.class)); VirtualFile sdkFile = VirtualFileManager.getInstance().findFileByUrl(url); @@ -273,21 +269,22 @@ private ScriptEnvironment getScriptEnvironmentForFile(VirtualFile vf) throws IOE return scriptEnvironmentMap.get(vf); } - ScriptEnvironment scriptEnvironment = new ScriptEnvironment(); - scriptEnvironment.exposer.exposeGlobalFunctions(this); - - // Cache the environment - scriptEnvironmentMap.put(vf, scriptEnvironment); - - // Run the initial script - LuaClosure closure = LuaCompiler.loadis(vf.getInputStream(), vf.getName(), scriptEnvironment.env); - LuaReturn rc = caller.protectedCall(scriptEnvironment.thread, closure); - - if (!rc.isSuccess()) { - log.info("Error during initial lua call: " + rc.getErrorString() + "\r\n\r\n" + rc.getLuaStackTrace()); - } - - return scriptEnvironment; +// ScriptEnvironment scriptEnvironment = new ScriptEnvironment(); +// scriptEnvironment.exposer.exposeGlobalFunctions(this); +// +// // Cache the environment +// scriptEnvironmentMap.put(vf, scriptEnvironment); +// +// // Run the initial script +// LuaClosure closure = LuaCompiler.loadis(vf.getInputStream(), vf.getName(), scriptEnvironment.env); +// LuaReturn rc = caller.protectedCall(scriptEnvironment.thread, closure); +// +// if (!rc.isSuccess()) { +// log.info("Error during initial lua call: " + rc.getErrorString() + "\r\n\r\n" + rc.getLuaStackTrace()); +// } +// +// return scriptEnvironment; + return null; } } @@ -326,22 +323,22 @@ private String runLua(String function, @Nullable VirtualFile luaFile, String nam return null; } - LuaClosure closure = LuaCompiler.loadstring( - "return " + function + "('" + nameToDocument + "', '" + docLuaFileUrl + "')", "", scriptEnvironment.env - ); - LuaReturn rc = caller.protectedCall(scriptEnvironment.thread, closure); - - if (!rc.isSuccess()) { - log.info("Error during lua call: " + rc.getErrorString() + "\r\n\r\n" + rc.getLuaStackTrace()); - } - - if (!rc.isEmpty()) { - String unencoded = (String) rc.getFirst(); - - byte[] bytes = unencoded.getBytes(); - - return new String(bytes, CharsetToolkit.UTF8); - } +// LuaClosure closure = LuaCompiler.loadstring( +// "return " + function + "('" + nameToDocument + "', '" + docLuaFileUrl + "')", "", scriptEnvironment.env +// ); +// LuaReturn rc = caller.protectedCall(scriptEnvironment.thread, closure); +// +// if (!rc.isSuccess()) { +// log.info("Error during lua call: " + rc.getErrorString() + "\r\n\r\n" + rc.getLuaStackTrace()); +// } +// +// if (!rc.isEmpty()) { +// String unencoded = (String) rc.getFirst(); +// +// byte[] bytes = unencoded.getBytes(); +// +// return new String(bytes, CharsetToolkit.UTF8); +// } } catch (IOException e) { diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaCodeStyleConfigurable.java b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaCodeStyleConfigurable.java index 20c05050..694ede21 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaCodeStyleConfigurable.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaCodeStyleConfigurable.java @@ -19,6 +19,7 @@ import consulo.language.codeStyle.CodeStyleSettings; import consulo.language.codeStyle.ui.setting.CodeStyleAbstractConfigurable; import consulo.language.codeStyle.ui.setting.CodeStyleAbstractPanel; +import consulo.localize.LocalizeValue; /** * Created by IntelliJ IDEA. @@ -29,7 +30,7 @@ public class LuaCodeStyleConfigurable extends CodeStyleAbstractConfigurable { public LuaCodeStyleConfigurable(CodeStyleSettings settings, CodeStyleSettings originalSettings) { - super(settings, originalSettings, "Lua"); + super(settings, originalSettings, LocalizeValue.localizeTODO("Lua")); } @Override diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaCodeStyleSettingsProvider.java b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaCodeStyleSettingsProvider.java index 2ff5feb9..a91b7d4e 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaCodeStyleSettingsProvider.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaCodeStyleSettingsProvider.java @@ -20,8 +20,8 @@ import consulo.configurable.Configurable; import consulo.language.codeStyle.CodeStyleSettings; import consulo.language.codeStyle.setting.CodeStyleSettingsProvider; - -import javax.annotation.Nonnull; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. @@ -38,7 +38,7 @@ public Configurable createSettingsPage(CodeStyleSettings settings, CodeStyleSett } @Override - public String getConfigurableDisplayName() { - return "Lua"; + public LocalizeValue getConfigurableDisplayName() { + return LocalizeValue.localizeTODO("Lua"); } } diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaFormattingModelBuilder.java b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaFormattingModelBuilder.java index 892c0251..43e4534d 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaFormattingModelBuilder.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaFormattingModelBuilder.java @@ -25,8 +25,7 @@ import consulo.language.codeStyle.*; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaLanguageCodeStyleSettingsProvider.java b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaLanguageCodeStyleSettingsProvider.java index 62ff0dca..324c7c5f 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaLanguageCodeStyleSettingsProvider.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/LuaLanguageCodeStyleSettingsProvider.java @@ -24,8 +24,8 @@ import consulo.language.codeStyle.setting.IndentOptionsEditor; import consulo.language.codeStyle.setting.LanguageCodeStyleSettingsProvider; import consulo.language.codeStyle.ui.setting.SmartIndentOptionsEditor; +import jakarta.annotation.Nonnull; -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/blocks/LuaFormattingBlock.java b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/blocks/LuaFormattingBlock.java index 63aee76d..7e3de7f5 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/blocks/LuaFormattingBlock.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/blocks/LuaFormattingBlock.java @@ -16,29 +16,27 @@ package com.sylvanaar.idea.lua.lang.formatter.blocks; +import com.sylvanaar.idea.lua.lang.formatter.processors.LuaSpacingProcessorBasic; +import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; +import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaBinaryExpression; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaTableConstructor; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaIdentifierList; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaParameterList; import consulo.document.util.TextRange; import consulo.language.ast.ASTNode; +import consulo.language.ast.ILazyParseableElementType; import consulo.language.codeStyle.*; +import consulo.language.psi.PsiComment; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiErrorElement; import consulo.language.psi.PsiWhiteSpace; import consulo.logging.Logger; -import consulo.language.psi.PsiComment; -import consulo.language.ast.ILazyParseableElementType; -import com.sylvanaar.idea.lua.lang.formatter.processors.LuaSpacingProcessorBasic; -import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; -import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; -import com.sylvanaar.idea.lua.lang.psi.expressions.LuaBinaryExpression; -import com.sylvanaar.idea.lua.lang.psi.lists.LuaIdentifierList; -import com.sylvanaar.idea.lua.lang.psi.lists.LuaParameterList; -import com.sylvanaar.idea.lua.lang.psi.expressions.LuaTableConstructor; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.List; - public class LuaFormattingBlock implements Block { public static final Logger LOG = Logger.getInstance("Lua.LuaBlock"); diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/processors/LuaIndentProcessor.java b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/processors/LuaIndentProcessor.java index a392a511..a398d4c1 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/processors/LuaIndentProcessor.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/processors/LuaIndentProcessor.java @@ -16,22 +16,18 @@ package com.sylvanaar.idea.lua.lang.formatter.processors; -import javax.annotation.Nonnull; - -import consulo.language.codeStyle.Indent; -import consulo.language.ast.ASTNode; import com.sylvanaar.idea.lua.lang.formatter.blocks.LuaFormattingBlock; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaTableConstructor; import com.sylvanaar.idea.lua.lang.psi.lists.LuaFunctionArguments; import com.sylvanaar.idea.lua.lang.psi.statements.LuaBlock; import com.sylvanaar.idea.lua.lang.psi.statements.LuaStatementElement; +import consulo.language.ast.ASTNode; +import consulo.language.codeStyle.Indent; import consulo.language.psi.PsiComment; import consulo.language.psi.PsiElement; - -import javax.annotation.Nullable; - - +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; public abstract class LuaIndentProcessor implements LuaElementTypes { diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/processors/SpacingUtil.java b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/processors/SpacingUtil.java index d9be5581..9b17203c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/formatter/processors/SpacingUtil.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/formatter/processors/SpacingUtil.java @@ -16,18 +16,16 @@ package com.sylvanaar.idea.lua.lang.formatter.processors; -import javax.annotation.Nonnull; - +import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; import consulo.language.ast.ASTNode; import consulo.language.ast.IElementType; import consulo.language.ast.TokenSet; import consulo.language.codeStyle.FormatterUtil; import consulo.language.impl.ast.LeafElement; import consulo.language.impl.psi.LeafPsiElement; -import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiWhiteSpace; - +import jakarta.annotation.Nonnull; /** * @author ilyas diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/lexer/LuaElementType.java b/src/main/java/com/sylvanaar/idea/lua/lang/lexer/LuaElementType.java index 8b297004..44c4b358 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/lexer/LuaElementType.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/lexer/LuaElementType.java @@ -20,8 +20,7 @@ import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; import consulo.language.ast.ASTNode; import consulo.language.ast.IElementType; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/editor/LuaDocEnterHandlerDelegate.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/editor/LuaDocEnterHandlerDelegate.java index 6063580f..787c5db9 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/editor/LuaDocEnterHandlerDelegate.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/editor/LuaDocEnterHandlerDelegate.java @@ -36,9 +36,8 @@ import consulo.language.psi.PsiDocumentManager; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; -import consulo.util.lang.ref.Ref; - -import javax.annotation.Nonnull; +import consulo.util.lang.ref.SimpleReference; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. @@ -49,7 +48,7 @@ @ExtensionImpl public class LuaDocEnterHandlerDelegate implements EnterHandlerDelegate { @Override - public Result preprocessEnter(PsiFile file, Editor editor, Ref caretOffset, consulo.util.lang.ref.Ref caretAdvance, + public Result preprocessEnter(PsiFile file, Editor editor, SimpleReference caretOffset, consulo.util.lang.ref.SimpleReference caretAdvance, DataContext dataContext, EditorActionHandler originalHandler) { if (!(file instanceof LuaPsiFile)) { return Result.Continue; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/highlighter/LuaDocSyntaxHighlighter.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/highlighter/LuaDocSyntaxHighlighter.java index cacfcfa9..223411a4 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/highlighter/LuaDocSyntaxHighlighter.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/highlighter/LuaDocSyntaxHighlighter.java @@ -16,16 +16,15 @@ package com.sylvanaar.idea.lua.lang.luadoc.highlighter; -import consulo.colorScheme.TextAttributesKey; -import consulo.language.ast.IElementType; -import consulo.language.ast.TokenSet; import com.sylvanaar.idea.lua.editor.highlighter.LuaHighlightingData; import com.sylvanaar.idea.lua.lang.luadoc.lexer.LuaDocLexer; import com.sylvanaar.idea.lua.lang.luadoc.lexer.LuaDocTokenTypes; +import consulo.colorScheme.TextAttributesKey; +import consulo.language.ast.IElementType; +import consulo.language.ast.TokenSet; import consulo.language.editor.highlight.SyntaxHighlighterBase; import consulo.language.lexer.Lexer; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/lexer/LuaDocElementType.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/lexer/LuaDocElementType.java index 80eb6647..5129c0bb 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/lexer/LuaDocElementType.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/lexer/LuaDocElementType.java @@ -16,13 +16,12 @@ package com.sylvanaar.idea.lua.lang.luadoc.lexer; -import consulo.language.ast.IElementType; import consulo.language.Language; +import consulo.language.ast.IElementType; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - /** * @author ilyas */ diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/LuaDocElementTypes.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/LuaDocElementTypes.java index d25ae4c3..600be7c5 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/LuaDocElementTypes.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/LuaDocElementTypes.java @@ -16,22 +16,19 @@ package com.sylvanaar.idea.lua.lang.luadoc.parser; -import javax.annotation.Nonnull; - -import consulo.language.Language; -import consulo.language.ast.ASTNode; -import consulo.language.ast.ILazyParseableElementType; -import consulo.language.parser.PsiBuilder; -import consulo.language.parser.PsiBuilderFactory; -import consulo.language.parser.PsiParser; import com.sylvanaar.idea.lua.LuaFileType; import com.sylvanaar.idea.lua.lang.luadoc.lexer.LuaDocElementType; import com.sylvanaar.idea.lua.lang.luadoc.lexer.LuaDocElementTypeImpl; import com.sylvanaar.idea.lua.lang.luadoc.lexer.LuaDocLexer; import com.sylvanaar.idea.lua.lang.luadoc.lexer.LuaDocTokenTypes; import com.sylvanaar.idea.lua.lang.luadoc.psi.impl.LuaDocCommentImpl; -import consulo.language.version.LanguageVersionUtil; +import consulo.language.ast.ASTNode; +import consulo.language.ast.ILazyParseableElementType; +import consulo.language.parser.PsiBuilder; +import consulo.language.parser.PsiBuilderFactory; +import consulo.language.parser.PsiParser; import consulo.language.psi.PsiElement; +import consulo.language.version.LanguageVersionUtil; import consulo.project.Project; /** @@ -42,12 +39,7 @@ public interface LuaDocElementTypes extends LuaDocTokenTypes { /** * LuaDoc comment */ - ILazyParseableElementType LUADOC_COMMENT = new ILazyParseableElementType("LuaDocComment") { - @Nonnull - public Language getLanguage() { - return LuaFileType.LUA_FILE_TYPE.getLanguage(); - } - + ILazyParseableElementType LUADOC_COMMENT = new ILazyParseableElementType("LuaDocComment", LuaFileType.LUA_FILE_TYPE.getLanguage()) { public ASTNode parseContents(ASTNode chameleon) { final PsiElement parentElement = chameleon.getTreeParent().getPsi(); diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/LuaDocParser.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/LuaDocParser.java index f83aaa5b..0c76b9e2 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/LuaDocParser.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/LuaDocParser.java @@ -16,15 +16,13 @@ package com.sylvanaar.idea.lua.lang.luadoc.parser; -import javax.annotation.Nonnull; - -import consulo.language.ast.IElementType; -import consulo.language.parser.PsiBuilder; import com.sylvanaar.idea.lua.lang.luadoc.parser.parsing.LuaDocParsing; import consulo.language.ast.ASTNode; +import consulo.language.ast.IElementType; +import consulo.language.parser.PsiBuilder; import consulo.language.parser.PsiParser; import consulo.language.version.LanguageVersion; - +import jakarta.annotation.Nonnull; /** * @author ilyas diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/elements/LuaDocChameleonElementType.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/elements/LuaDocChameleonElementType.java index ba021007..5b6bac1d 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/elements/LuaDocChameleonElementType.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/elements/LuaDocChameleonElementType.java @@ -17,20 +17,12 @@ package com.sylvanaar.idea.lua.lang.luadoc.parser.elements; import com.sylvanaar.idea.lua.LuaFileType; -import consulo.language.Language; import consulo.language.ast.ILazyParseableElementType; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nonnull; public abstract class LuaDocChameleonElementType extends ILazyParseableElementType { public LuaDocChameleonElementType(@NonNls String debugName) { - super(debugName); + super(debugName, LuaFileType.LUA_FILE_TYPE.getLanguage()); } - - @Nonnull - public Language getLanguage() { - return LuaFileType.LUA_FILE_TYPE.getLanguage(); - } - } diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/elements/LuaDocTagValueTokenType.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/elements/LuaDocTagValueTokenType.java index 84d5ca42..a6aab4b7 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/elements/LuaDocTagValueTokenType.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/parser/elements/LuaDocTagValueTokenType.java @@ -16,19 +16,19 @@ package com.sylvanaar.idea.lua.lang.luadoc.parser.elements; -import consulo.language.ast.ASTNode; -import consulo.language.parser.PsiBuilder; -import consulo.language.parser.PsiBuilderFactory; -import consulo.language.psi.PsiElement; -import consulo.project.Project; -import consulo.language.impl.psi.LeafPsiElement; import com.sylvanaar.idea.lua.lang.luadoc.lexer.ILuaDocElementType; import com.sylvanaar.idea.lua.lang.luadoc.lexer.LuaDocLexer; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocTag; import com.sylvanaar.idea.lua.lang.parser.util.ParserUtils; +import consulo.language.ast.ASTNode; +import consulo.language.impl.psi.LeafPsiElement; +import consulo.language.parser.PsiBuilder; +import consulo.language.parser.PsiBuilderFactory; +import consulo.language.psi.PsiElement; import consulo.language.version.LanguageVersionUtil; +import consulo.project.Project; +import jakarta.annotation.Nonnull; -import javax.annotation.Nonnull; import java.util.Arrays; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocComment.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocComment.java index ba3f4cea..6d0f132d 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocComment.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocComment.java @@ -16,13 +16,11 @@ package com.sylvanaar.idea.lua.lang.luadoc.psi.api; -import javax.annotation.Nonnull; - import consulo.language.psi.PsiElement; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nullable; - public interface LuaDocComment extends /*PsiDocComment,*/ LuaDocPsiElement { @Nullable diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocCommentOwner.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocCommentOwner.java index b5c27b81..7f1b4603 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocCommentOwner.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocCommentOwner.java @@ -17,8 +17,7 @@ package com.sylvanaar.idea.lua.lang.luadoc.psi.api; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; -import javax.annotation.Nullable; - +import jakarta.annotation.Nullable; public interface LuaDocCommentOwner extends LuaPsiElement /*, PsiDocCommentOwner */ { @Nullable diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocReferenceElement.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocReferenceElement.java index 2bc63579..0482e4b3 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocReferenceElement.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocReferenceElement.java @@ -16,10 +16,8 @@ package com.sylvanaar.idea.lua.lang.luadoc.psi.api; - import consulo.language.psi.PsiReference; -import javax.annotation.Nullable; - +import jakarta.annotation.Nullable; public interface LuaDocReferenceElement extends LuaDocPsiElement, PsiReference { @Nullable diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocTag.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocTag.java index 0ea45255..413a8080 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocTag.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/api/LuaDocTag.java @@ -16,11 +16,11 @@ package com.sylvanaar.idea.lua.lang.luadoc.psi.api; -import consulo.language.psi.PsiElement; import com.sylvanaar.idea.lua.lang.psi.LuaNamedElement; +import consulo.language.psi.PsiElement; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; /** * @author ilyas diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocCommentImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocCommentImpl.java index 3901b5ad..47abe564 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocCommentImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocCommentImpl.java @@ -16,13 +16,6 @@ package com.sylvanaar.idea.lua.lang.luadoc.psi.impl; -import consulo.language.psi.PsiElement; -import consulo.language.psi.util.PsiTreeUtil; -import consulo.util.lang.StringUtil; -import consulo.language.psi.PsiWhiteSpace; -import consulo.language.impl.psi.LazyParseablePsiElement; -import consulo.language.ast.IElementType; -import consulo.util.lang.CharArrayUtil; import com.sylvanaar.idea.lua.lang.luadoc.parser.LuaDocElementTypes; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocComment; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocCommentOwner; @@ -31,9 +24,16 @@ import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; +import consulo.language.ast.IElementType; +import consulo.language.impl.psi.LazyParseablePsiElement; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiWhiteSpace; +import consulo.language.psi.util.PsiTreeUtil; +import consulo.util.lang.CharArrayUtil; +import consulo.util.lang.StringUtil; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocCommentUtil.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocCommentUtil.java index c0bc8b66..91047f3a 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocCommentUtil.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocCommentUtil.java @@ -16,9 +16,6 @@ package com.sylvanaar.idea.lua.lang.luadoc.psi.impl; -import consulo.language.ast.ASTNode; -import consulo.logging.Logger; -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.luadoc.psi.api.LuaDocPsiElement; @@ -27,7 +24,10 @@ import com.sylvanaar.idea.lua.lang.psi.statements.LuaBlock; import com.sylvanaar.idea.lua.lang.psi.statements.LuaMaybeDeclarationAssignmentStatement; import com.sylvanaar.idea.lua.lang.psi.statements.LuaStatementElement; -import javax.annotation.Nullable; +import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; +import consulo.logging.Logger; +import jakarta.annotation.Nullable; public abstract class LuaDocCommentUtil { diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocFieldReferenceImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocFieldReferenceImpl.java index 0844beff..9d247ec6 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocFieldReferenceImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocFieldReferenceImpl.java @@ -16,14 +16,6 @@ package com.sylvanaar.idea.lua.lang.luadoc.psi.impl; -import consulo.language.ast.ASTNode; -import consulo.document.util.TextRange; -import consulo.language.psi.PsiReference; -import consulo.language.util.IncorrectOperationException; -import consulo.util.lang.StringUtil; -import consulo.language.psi.PsiElement; -import consulo.language.psi.ResolveResult; -import consulo.util.collection.ArrayUtil; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocFieldReference; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocTagValueToken; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElementFactory; @@ -33,8 +25,16 @@ import com.sylvanaar.idea.lua.lang.psi.expressions.LuaTableConstructor; import com.sylvanaar.idea.lua.lang.psi.resolve.LuaResolveResult; import com.sylvanaar.idea.lua.lang.psi.resolve.LuaResolveResultImpl; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import consulo.document.util.TextRange; +import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiReference; +import consulo.language.psi.ResolveResult; +import consulo.language.util.IncorrectOperationException; +import consulo.util.collection.ArrayUtil; +import consulo.util.lang.StringUtil; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.ArrayList; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocParameterReferenceImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocParameterReferenceImpl.java index d848d9e6..f0407700 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocParameterReferenceImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocParameterReferenceImpl.java @@ -16,12 +16,6 @@ package com.sylvanaar.idea.lua.lang.luadoc.psi.impl; -import consulo.language.ast.ASTNode; -import consulo.document.util.TextRange; -import consulo.language.psi.PsiElement; -import consulo.language.psi.ResolveResult; -import consulo.util.collection.ArrayUtil; -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocParameterReference; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocTagValueToken; import com.sylvanaar.idea.lua.lang.psi.LuaFunctionDefinition; @@ -29,15 +23,19 @@ import com.sylvanaar.idea.lua.lang.psi.resolve.LuaResolveResult; import com.sylvanaar.idea.lua.lang.psi.resolve.LuaResolveResultImpl; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaParameter; +import consulo.document.util.TextRange; +import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; import consulo.language.psi.PsiReference; +import consulo.language.psi.ResolveResult; +import consulo.language.util.IncorrectOperationException; +import consulo.util.collection.ArrayUtil; import consulo.util.lang.StringUtil; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.ArrayList; -import javax.annotation.Nullable; - /** * @author ilyas */ diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocPsiElementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocPsiElementImpl.java index f13a5e1b..bf3a78be 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocPsiElementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocPsiElementImpl.java @@ -19,8 +19,7 @@ import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocPsiElement; import com.sylvanaar.idea.lua.lang.psi.impl.LuaPsiElementImpl; import consulo.language.ast.ASTNode; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * @author ilyas diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocReferenceElementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocReferenceElementImpl.java index 540203b7..a9670042 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocReferenceElementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocReferenceElementImpl.java @@ -16,15 +16,12 @@ package com.sylvanaar.idea.lua.lang.luadoc.psi.impl; -import javax.annotation.Nonnull; - import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocReferenceElement; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocTagValueToken; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; - -import javax.annotation.Nullable; - +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; public abstract class LuaDocReferenceElementImpl extends LuaDocPsiElementImpl implements LuaDocReferenceElement { diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocSymbolReferenceElementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocSymbolReferenceElementImpl.java index 13758810..5b49fdbd 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocSymbolReferenceElementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocSymbolReferenceElementImpl.java @@ -36,10 +36,10 @@ import consulo.language.util.IncorrectOperationException; import consulo.project.content.scope.ProjectScopes; import consulo.util.lang.StringUtil; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.Collection; /** diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocTagImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocTagImpl.java index 55406f79..3415ed7f 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocTagImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocTagImpl.java @@ -16,23 +16,22 @@ package com.sylvanaar.idea.lua.lang.luadoc.psi.impl; -import consulo.language.ast.ASTNode; -import consulo.language.psi.PsiElement; -import consulo.language.ast.TokenSet; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.*; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElementFactory; import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.ast.ASTNode; +import consulo.language.ast.TokenSet; +import consulo.language.psi.PsiElement; import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.List; import static com.sylvanaar.idea.lua.lang.luadoc.parser.LuaDocElementTypes.*; - /** * @author ilyas */ diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocTagValueTokenImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocTagValueTokenImpl.java index 9a5153c0..2e95a473 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocTagValueTokenImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/psi/impl/LuaDocTagValueTokenImpl.java @@ -16,10 +16,9 @@ package com.sylvanaar.idea.lua.lang.luadoc.psi.impl; - -import consulo.language.ast.ASTNode; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocTagValueToken; -import javax.annotation.Nonnull; +import consulo.language.ast.ASTNode; +import jakarta.annotation.Nonnull; public class LuaDocTagValueTokenImpl extends LuaDocPsiElementImpl implements LuaDocTagValueToken { diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/references/LuaDocReferenceProvider.java b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/references/LuaDocReferenceProvider.java index 4fde277c..f9874954 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/references/LuaDocReferenceProvider.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/luadoc/references/LuaDocReferenceProvider.java @@ -16,15 +16,13 @@ package com.sylvanaar.idea.lua.lang.luadoc.references; -import javax.annotation.Nonnull; - -import consulo.language.psi.PsiReference; -import consulo.language.psi.PsiReferenceProvider; -import consulo.language.util.ProcessingContext; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocPsiElement; import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiReference; +import consulo.language.psi.PsiReferenceProvider; import consulo.language.psi.filter.ElementFilter; - +import consulo.language.util.ProcessingContext; +import jakarta.annotation.Nonnull; /** * @author ilyas diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/parser/LuaParserDefinition.java b/src/main/java/com/sylvanaar/idea/lua/lang/parser/LuaParserDefinition.java index 24861959..6beec17e 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/parser/LuaParserDefinition.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/parser/LuaParserDefinition.java @@ -38,8 +38,7 @@ import consulo.language.psi.stub.IStubFileElementType; import consulo.language.util.LanguageUtil; import consulo.language.version.LanguageVersion; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import static com.sylvanaar.idea.lua.lang.parser.LuaElementTypes.*; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/parser/LuaPsiBuilder.java b/src/main/java/com/sylvanaar/idea/lua/lang/parser/LuaPsiBuilder.java index dc8f41af..f3cb6907 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/parser/LuaPsiBuilder.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/parser/LuaPsiBuilder.java @@ -23,8 +23,7 @@ import consulo.language.parser.WhitespaceSkippedCallback; import consulo.language.psi.PsiFile; import consulo.logging.Logger; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/parser/kahlua/FuncState.java b/src/main/java/com/sylvanaar/idea/lua/lang/parser/kahlua/FuncState.java index 45e4ae3e..2ec022f0 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/parser/kahlua/FuncState.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/parser/kahlua/FuncState.java @@ -15,13 +15,11 @@ */ package com.sylvanaar.idea.lua.lang.parser.kahlua; - -import java.util.Hashtable; - -import consulo.logging.Logger; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; +import consulo.logging.Logger; import se.krka.kahlua.vm.Prototype; +import java.util.Hashtable; public class FuncState { diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/parser/kahlua/KahluaParser.java b/src/main/java/com/sylvanaar/idea/lua/lang/parser/kahlua/KahluaParser.java index 311242cb..151ab2d8 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/parser/kahlua/KahluaParser.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/parser/kahlua/KahluaParser.java @@ -15,28 +15,27 @@ */ package com.sylvanaar.idea.lua.lang.parser.kahlua; +import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; +import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; +import com.sylvanaar.idea.lua.lang.parser.LuaPsiBuilder; import consulo.component.ProcessCanceledException; +import consulo.container.PluginException; +import consulo.container.plugin.PluginId; import consulo.language.ast.ASTNode; +import consulo.language.ast.IElementType; import consulo.language.parser.PsiBuilder; +import consulo.language.parser.PsiParser; import consulo.language.parser.WhitespaceSkippedCallback; import consulo.language.psi.PsiFile; +import consulo.language.version.LanguageVersion; import consulo.logging.Logger; import consulo.virtualFileSystem.VirtualFile; -import consulo.language.ast.IElementType; -import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; -import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; -import com.sylvanaar.idea.lua.lang.parser.LuaPsiBuilder; -import consulo.container.PluginException; -import consulo.container.plugin.PluginId; -import consulo.language.version.LanguageVersion; -import consulo.language.parser.PsiParser; +import jakarta.annotation.Nonnull; import se.krka.kahlua.vm.Prototype; -import javax.annotation.Nonnull; import java.io.IOException; import java.io.Reader; - public class KahluaParser implements PsiParser, LuaElementTypes { public int nCcalls = 0; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaFunctionDefinition.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaFunctionDefinition.java index b553b0f1..7b94213f 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaFunctionDefinition.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaFunctionDefinition.java @@ -24,9 +24,8 @@ import com.sylvanaar.idea.lua.lang.psi.types.LuaFunction; import consulo.document.util.TextRange; import consulo.navigation.ItemPresentation; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaPsiElement.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaPsiElement.java index ddba806d..668e779d 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaPsiElement.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaPsiElement.java @@ -16,13 +16,11 @@ package com.sylvanaar.idea.lua.lang.psi; -import javax.annotation.Nonnull; - +import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; -import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.navigation.NavigationItem; - +import jakarta.annotation.Nonnull; public interface LuaPsiElement extends PsiElement, NavigationItem { diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaPsiFile.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaPsiFile.java index d6c1267e..fd7e472e 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaPsiFile.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaPsiFile.java @@ -21,8 +21,7 @@ import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; import consulo.language.psi.stub.PsiFileWithStubSupport; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaPsiManager.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaPsiManager.java index ec3abaee..920871cb 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaPsiManager.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/LuaPsiManager.java @@ -47,9 +47,9 @@ import consulo.project.startup.StartupManager; import consulo.virtualFileSystem.VirtualFile; import consulo.virtualFileSystem.util.PathsList; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.*; import java.util.concurrent.*; import java.util.concurrent.atomic.AtomicInteger; @@ -114,7 +114,7 @@ public Collection getFilteredGlobalsCache() { public LuaPsiManager(Project project, StartupManager startupManager) { myProject = project; - startupManager.registerPostStartupActivity(uiAccess -> projectOpened()); + startupManager.registerPostStartupActivity(this::projectOpened); } private void reset() { diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/controlFlow/Instruction.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/controlFlow/Instruction.java index 3da88290..22cb5d93 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/controlFlow/Instruction.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/controlFlow/Instruction.java @@ -15,9 +15,8 @@ */ package com.sylvanaar.idea.lua.lang.psi.controlFlow; -import javax.annotation.Nullable; - import consulo.language.psi.PsiElement; +import jakarta.annotation.Nullable; public interface Instruction { Iterable succ(CallEnvironment env); diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/controlFlow/impl/ControlFlowBuilder.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/controlFlow/impl/ControlFlowBuilder.java index 3b2285c6..e02df335 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/controlFlow/impl/ControlFlowBuilder.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/controlFlow/impl/ControlFlowBuilder.java @@ -15,12 +15,6 @@ */ package com.sylvanaar.idea.lua.lang.psi.controlFlow.impl; -import consulo.project.Project; -import consulo.util.lang.Pair; -import consulo.language.psi.PsiElement; -import consulo.language.psi.PsiErrorElement; -import consulo.language.psi.PsiFile; -import consulo.language.psi.util.PsiTreeUtil; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; @@ -37,16 +31,20 @@ import com.sylvanaar.idea.lua.lang.psi.util.LuaAssignment; import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaRecursiveElementVisitor; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiErrorElement; +import consulo.language.psi.PsiFile; +import consulo.language.psi.util.PsiTreeUtil; import consulo.logging.Logger; +import consulo.project.Project; +import consulo.util.lang.Pair; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.Collections; import java.util.List; import java.util.Stack; -import javax.annotation.Nullable; - - /** * @author ven */ diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/controlFlow/impl/InstructionImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/controlFlow/impl/InstructionImpl.java index c5850a7a..be21e0d5 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/controlFlow/impl/InstructionImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/controlFlow/impl/InstructionImpl.java @@ -15,13 +15,12 @@ */ package com.sylvanaar.idea.lua.lang.psi.controlFlow.impl; - -import consulo.language.psi.PsiElement; -import consulo.logging.Logger; import com.sylvanaar.idea.lua.lang.psi.controlFlow.CallEnvironment; import com.sylvanaar.idea.lua.lang.psi.controlFlow.CallInstruction; import com.sylvanaar.idea.lua.lang.psi.controlFlow.Instruction; -import javax.annotation.Nullable; +import consulo.language.psi.PsiElement; +import consulo.logging.Logger; +import jakarta.annotation.Nullable; import java.util.ArrayList; import java.util.Stack; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/DfaInstance.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/DfaInstance.java index af8364d4..cfdc1251 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/DfaInstance.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/DfaInstance.java @@ -15,9 +15,8 @@ */ package com.sylvanaar.idea.lua.lang.psi.dataFlow; -import javax.annotation.Nonnull; - import com.sylvanaar.idea.lua.lang.psi.controlFlow.Instruction; +import jakarta.annotation.Nonnull; /** * @author ven diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsCollector.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsCollector.java index 673ffffe..e294ad5c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsCollector.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsCollector.java @@ -15,9 +15,6 @@ */ package com.sylvanaar.idea.lua.lang.psi.dataFlow.reachingDefs; -import consulo.language.psi.PsiElement; -import consulo.language.psi.PsiManager; -import consulo.language.psi.util.PsiTreeUtil; import com.sylvanaar.idea.lua.lang.psi.LuaControlFlowOwner; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; import com.sylvanaar.idea.lua.lang.psi.LuaPsiFileBase; @@ -29,10 +26,13 @@ import com.sylvanaar.idea.lua.lang.psi.statements.LuaBlock; import com.sylvanaar.idea.lua.lang.psi.statements.LuaStatementElement; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiManager; +import consulo.language.psi.util.PsiTreeUtil; import consulo.util.collection.primitive.ints.*; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.*; import java.util.function.IntConsumer; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsDfaInstance.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsDfaInstance.java index 84fe1176..25f8aabe 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsDfaInstance.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/reachingDefs/ReachingDefinitionsDfaInstance.java @@ -24,8 +24,7 @@ import consulo.util.collection.primitive.ints.IntSets; import consulo.util.collection.primitive.objects.ObjectIntMap; import consulo.util.collection.primitive.objects.ObjectMaps; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * @author ven diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/reachingDefs/VariableInfo.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/reachingDefs/VariableInfo.java index 3c5dfa9e..3482c3f1 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/reachingDefs/VariableInfo.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/dataFlow/reachingDefs/VariableInfo.java @@ -15,11 +15,9 @@ */ package com.sylvanaar.idea.lua.lang.psi.dataFlow.reachingDefs; -import javax.annotation.Nonnull; - import com.sylvanaar.idea.lua.lang.psi.types.LuaType; - -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * @author ven diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/expressions/LuaExpression.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/expressions/LuaExpression.java index eb1ee882..da897170 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/expressions/LuaExpression.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/expressions/LuaExpression.java @@ -16,14 +16,13 @@ package com.sylvanaar.idea.lua.lang.psi.expressions; -import consulo.application.util.CachedValue; -import consulo.language.psi.PsiElement; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import consulo.application.util.CachedValue; +import consulo.language.psi.PsiElement; import consulo.util.dataholder.Key; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/expressions/LuaFunctionCallExpression.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/expressions/LuaFunctionCallExpression.java index f6c1a903..6a5f409d 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/expressions/LuaFunctionCallExpression.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/expressions/LuaFunctionCallExpression.java @@ -16,10 +16,9 @@ package com.sylvanaar.idea.lua.lang.psi.expressions; -import javax.annotation.Nullable; - import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiElementFactoryImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiElementFactoryImpl.java index 5a66c77e..0ddd0175 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiElementFactoryImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiElementFactoryImpl.java @@ -15,8 +15,6 @@ */ package com.sylvanaar.idea.lua.lang.psi.impl; -import consulo.annotation.component.ServiceImpl; -import consulo.language.psi.PsiComment; import com.sylvanaar.idea.lua.LuaFileType; import com.sylvanaar.idea.lua.debugger.LuaCodeFragment; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocComment; @@ -33,16 +31,16 @@ import com.sylvanaar.idea.lua.lang.psi.symbols.LuaIdentifier; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.annotation.component.ServiceImpl; +import consulo.language.psi.PsiComment; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFileFactory; import consulo.language.psi.util.PsiTreeUtil; import consulo.project.Project; +import jakarta.annotation.Nullable; import jakarta.inject.Inject; import jakarta.inject.Singleton; -import javax.annotation.Nullable; - - /** * Created by IntelliJ IDEA. * User: Jon S Akhtar diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiElementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiElementImpl.java index 3f4bd5bf..3f658e75 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiElementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiElementImpl.java @@ -16,23 +16,22 @@ package com.sylvanaar.idea.lua.lang.psi.impl; -import javax.annotation.Nonnull; - +import com.sylvanaar.idea.lua.LuaFileType; +import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; +import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.Language; +import consulo.language.ast.ASTNode; import consulo.language.impl.ast.ChangeUtil; import consulo.language.impl.ast.CompositeElement; import consulo.language.impl.ast.TreeElement; import consulo.language.impl.psi.ASTWrapperPsiElement; -import consulo.language.ast.ASTNode; -import consulo.language.Language; +import consulo.language.impl.psi.CheckUtil; import consulo.language.impl.psi.SourceTreeToPsiMap; -import consulo.language.psi.PsiElementVisitor; -import consulo.logging.Logger; import consulo.language.psi.PsiElement; -import consulo.language.impl.psi.CheckUtil; +import consulo.language.psi.PsiElementVisitor; import consulo.language.util.IncorrectOperationException; -import com.sylvanaar.idea.lua.LuaFileType; -import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; -import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.logging.Logger; +import jakarta.annotation.Nonnull; public class LuaPsiElementImpl extends ASTWrapperPsiElement implements LuaPsiElement { private static final Logger log = Logger.getInstance("Lua.LuaPsiElementImpl"); diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiFileBaseImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiFileBaseImpl.java index 1554acec..a965484d 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiFileBaseImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiFileBaseImpl.java @@ -16,11 +16,11 @@ package com.sylvanaar.idea.lua.lang.psi.impl; +import com.sylvanaar.idea.lua.lang.psi.LuaPsiFileBase; +import consulo.language.Language; import consulo.language.file.FileViewProvider; import consulo.language.impl.psi.PsiFileBase; -import consulo.language.Language; -import com.sylvanaar.idea.lua.lang.psi.LuaPsiFileBase; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiFileImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiFileImpl.java index c888c88a..70c6eb92 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiFileImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiFileImpl.java @@ -40,9 +40,9 @@ import consulo.language.util.IncorrectOperationException; import consulo.logging.Logger; import consulo.virtualFileSystem.fileType.FileType; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.*; /** diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiKeywordImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiKeywordImpl.java index 6f127e4e..9e48834d 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiKeywordImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiKeywordImpl.java @@ -16,14 +16,13 @@ package com.sylvanaar.idea.lua.lang.psi.impl; -import javax.annotation.Nonnull; - -import consulo.language.psi.PsiElementVisitor; -import consulo.language.impl.psi.LeafPsiElement; -import consulo.language.ast.IElementType; import com.sylvanaar.idea.lua.lang.psi.LuaPsiKeyword; import com.sylvanaar.idea.lua.lang.psi.LuaPsiToken; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.ast.IElementType; +import consulo.language.impl.psi.LeafPsiElement; +import consulo.language.psi.PsiElementVisitor; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiTokenImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiTokenImpl.java index 5f3af955..9c511840 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiTokenImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaPsiTokenImpl.java @@ -16,13 +16,12 @@ package com.sylvanaar.idea.lua.lang.psi.impl; -import javax.annotation.Nonnull; - -import consulo.language.ast.IElementType; import com.sylvanaar.idea.lua.lang.psi.LuaPsiToken; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.ast.IElementType; import consulo.language.impl.psi.LeafPsiElement; import consulo.language.psi.PsiElementVisitor; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaStubElementBase.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaStubElementBase.java index 0b76d701..f684841b 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaStubElementBase.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/LuaStubElementBase.java @@ -29,8 +29,7 @@ import consulo.language.psi.stub.StubElement; import consulo.navigation.ItemPresentation; import consulo.navigation.ItemPresentationProvider; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * @author ilyas diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/PsiUtil.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/PsiUtil.java index e09f66f7..edda64bb 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/PsiUtil.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/PsiUtil.java @@ -16,16 +16,15 @@ package com.sylvanaar.idea.lua.lang.psi.impl; -import javax.annotation.Nullable; - +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaParenthesizedExpression; +import consulo.document.util.TextRange; import consulo.language.codeStyle.CodeStyleManager; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiErrorElement; import consulo.language.psi.PsiWhiteSpace; -import consulo.logging.Logger; -import consulo.document.util.TextRange; import consulo.language.util.IncorrectOperationException; -import com.sylvanaar.idea.lua.lang.psi.expressions.LuaParenthesizedExpression; +import consulo.logging.Logger; +import jakarta.annotation.Nullable; /** * @author ven diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaAnonymousFunctionExpressionImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaAnonymousFunctionExpressionImpl.java index 4febca79..8d4840e4 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaAnonymousFunctionExpressionImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaAnonymousFunctionExpressionImpl.java @@ -15,19 +15,6 @@ */ package com.sylvanaar.idea.lua.lang.psi.impl.expressions; -import static com.sylvanaar.idea.lua.lang.parser.LuaElementTypes.BLOCK; -import static com.sylvanaar.idea.lua.lang.parser.LuaElementTypes.PARAMETER_LIST; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import consulo.document.util.TextRange; -import consulo.language.psi.PsiElementVisitor; -import consulo.language.psi.resolve.PsiScopeProcessor; -import consulo.language.psi.resolve.ResolveState; -import consulo.language.psi.util.PsiTreeUtil; -import consulo.navigation.ItemPresentation; -import consulo.language.psi.PsiElement; import com.sylvanaar.idea.lua.LuaIcons; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocComment; import com.sylvanaar.idea.lua.lang.luadoc.psi.impl.LuaDocCommentUtil; @@ -45,8 +32,20 @@ import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import com.sylvanaar.idea.lua.util.LuaAtomicNotNullLazyValue; +import consulo.document.util.TextRange; import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiElementVisitor; +import consulo.language.psi.resolve.PsiScopeProcessor; +import consulo.language.psi.resolve.ResolveState; +import consulo.language.psi.util.PsiTreeUtil; +import consulo.navigation.ItemPresentation; import consulo.ui.image.Image; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; + +import static com.sylvanaar.idea.lua.lang.parser.LuaElementTypes.BLOCK; +import static com.sylvanaar.idea.lua.lang.parser.LuaElementTypes.PARAMETER_LIST; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaBinaryExpressionImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaBinaryExpressionImpl.java index b0477c3a..eec03b92 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaBinaryExpressionImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaBinaryExpressionImpl.java @@ -16,17 +16,18 @@ package com.sylvanaar.idea.lua.lang.psi.impl.expressions; -import javax.annotation.Nonnull; - -import com.sylvanaar.idea.lua.lang.lexer.*; -import com.sylvanaar.idea.lua.lang.parser.*; -import com.sylvanaar.idea.lua.lang.psi.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.types.*; -import com.sylvanaar.idea.lua.lang.psi.visitor.*; +import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; +import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; +import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaBinaryExpression; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; +import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; import consulo.language.ast.IElementType; import consulo.language.psi.PsiElementVisitor; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaConditionalExpressionImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaConditionalExpressionImpl.java index 20b6217e..7b58d2d1 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaConditionalExpressionImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaConditionalExpressionImpl.java @@ -16,14 +16,13 @@ package com.sylvanaar.idea.lua.lang.psi.impl.expressions; -import consulo.language.ast.ASTNode; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaConditionalExpression; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaExpressionImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaExpressionImpl.java index f3d8bb13..c0b8cffb 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaExpressionImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaExpressionImpl.java @@ -16,15 +16,14 @@ package com.sylvanaar.idea.lua.lang.psi.impl.expressions; -import javax.annotation.Nonnull; - -import consulo.language.ast.ASTNode; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.impl.LuaPsiElementImpl; import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; +import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaFunctionCallExpressionImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaFunctionCallExpressionImpl.java index 5fc85f84..33b51fab 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaFunctionCallExpressionImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaFunctionCallExpressionImpl.java @@ -16,22 +16,23 @@ package com.sylvanaar.idea.lua.lang.psi.impl.expressions; -import com.sylvanaar.idea.lua.lang.psi.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.lists.*; +import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaFunctionCallExpression; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaFunctionArguments; import com.sylvanaar.idea.lua.lang.psi.types.*; -import com.sylvanaar.idea.lua.lang.psi.visitor.*; +import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; import consulo.language.psi.PsiNamedElement; import consulo.language.util.IncorrectOperationException; -import org.jetbrains.annotations.*; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; -import java.util.*; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import java.util.Iterator; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaKeyValueInitializerImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaKeyValueInitializerImpl.java index 68cb510d..ae5c1fe0 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaKeyValueInitializerImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaKeyValueInitializerImpl.java @@ -16,13 +16,12 @@ package com.sylvanaar.idea.lua.lang.psi.impl.expressions; -import javax.annotation.Nonnull; - -import consulo.language.psi.PsiElementVisitor; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaKeyValueInitializer; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElementVisitor; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaLiteralExpressionImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaLiteralExpressionImpl.java index 5bf7347e..6de5e762 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaLiteralExpressionImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaLiteralExpressionImpl.java @@ -16,18 +16,18 @@ package com.sylvanaar.idea.lua.lang.psi.impl.expressions; -import com.sylvanaar.idea.lua.lang.lexer.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.types.*; -import com.sylvanaar.idea.lua.lang.psi.visitor.*; +import com.sylvanaar.idea.lua.lang.lexer.LuaElementType; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaLiteralExpression; +import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; +import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; +import jakarta.annotation.Nonnull; import static com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes.*; -import javax.annotation.Nonnull; - /** * Created by IntelliJ IDEA. * User: Jon S Akhtar diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaModuleExpressionImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaModuleExpressionImpl.java index 81f54abf..1c47583c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaModuleExpressionImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaModuleExpressionImpl.java @@ -16,18 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.impl.expressions; -import consulo.document.util.TextRange; -import consulo.language.psi.PsiElement; -import consulo.language.psi.PsiElementVisitor; -import consulo.language.psi.PsiReference; -import consulo.language.psi.ResolveResult; -import consulo.language.psi.resolve.ResolveState; -import consulo.language.psi.stub.IStubElementType; -import consulo.language.util.IncorrectOperationException; -import consulo.util.lang.StringUtil; -import consulo.language.psi.resolve.ResolveCache; -import consulo.language.psi.resolve.PsiScopeProcessor; -import consulo.language.psi.util.PsiTreeUtil; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; @@ -45,10 +33,22 @@ import com.sylvanaar.idea.lua.lang.psi.types.*; import com.sylvanaar.idea.lua.lang.psi.util.SymbolUtil; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.document.util.TextRange; import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiElementVisitor; +import consulo.language.psi.PsiReference; +import consulo.language.psi.ResolveResult; +import consulo.language.psi.resolve.PsiScopeProcessor; +import consulo.language.psi.resolve.ResolveCache; +import consulo.language.psi.resolve.ResolveState; +import consulo.language.psi.stub.IStubElementType; +import consulo.language.psi.util.PsiTreeUtil; +import consulo.language.util.IncorrectOperationException; +import consulo.util.lang.StringUtil; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.List; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaParenthesizedExpressionImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaParenthesizedExpressionImpl.java index 26abe5d8..98b4e8ab 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaParenthesizedExpressionImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaParenthesizedExpressionImpl.java @@ -16,14 +16,14 @@ package com.sylvanaar.idea.lua.lang.psi.impl.expressions; -import javax.annotation.Nonnull; - -import consulo.language.ast.ASTNode; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaParenthesizedExpression; -import com.sylvanaar.idea.lua.lang.psi.types.*; +import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; +import com.sylvanaar.idea.lua.lang.psi.types.LuaType; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.ast.ASTNode; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaRequireExpressionImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaRequireExpressionImpl.java index 71a7871a..62545066 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaRequireExpressionImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaRequireExpressionImpl.java @@ -16,15 +16,15 @@ package com.sylvanaar.idea.lua.lang.psi.impl.expressions; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import com.sylvanaar.idea.lua.lang.psi.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.lists.*; -import com.sylvanaar.idea.lua.lang.psi.resolve.*; -import com.sylvanaar.idea.lua.lang.psi.symbols.*; -import com.sylvanaar.idea.lua.lang.psi.types.*; +import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaLiteralExpression; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaRequireExpression; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; +import com.sylvanaar.idea.lua.lang.psi.resolve.LuaResolveResult; +import com.sylvanaar.idea.lua.lang.psi.resolve.LuaResolver; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; +import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; +import com.sylvanaar.idea.lua.lang.psi.types.LuaType; import consulo.document.util.TextRange; import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; @@ -34,7 +34,9 @@ import consulo.language.util.IncorrectOperationException; import consulo.util.collection.ArrayUtil; import consulo.util.lang.StringUtil; -import org.jetbrains.annotations.*; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaStringLiteralExpressionImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaStringLiteralExpressionImpl.java index d23983b1..609fc98b 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaStringLiteralExpressionImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaStringLiteralExpressionImpl.java @@ -16,13 +16,13 @@ package com.sylvanaar.idea.lua.lang.psi.impl.expressions; -import consulo.language.ast.ASTNode; -import consulo.document.util.TextRange; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaLiteralExpression; import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import consulo.document.util.TextRange; +import consulo.language.ast.ASTNode; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaTableConstructorImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaTableConstructorImpl.java index 098ca50f..982f487f 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaTableConstructorImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaTableConstructorImpl.java @@ -16,25 +16,30 @@ package com.sylvanaar.idea.lua.lang.psi.impl.expressions; -import com.sylvanaar.idea.lua.lang.luadoc.psi.api.*; -import com.sylvanaar.idea.lua.lang.luadoc.psi.impl.*; -import com.sylvanaar.idea.lua.lang.parser.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.impl.*; -import com.sylvanaar.idea.lua.lang.psi.lists.*; -import com.sylvanaar.idea.lua.lang.psi.statements.*; -import com.sylvanaar.idea.lua.lang.psi.stubs.api.*; -import com.sylvanaar.idea.lua.lang.psi.types.*; -import com.sylvanaar.idea.lua.lang.psi.util.*; -import com.sylvanaar.idea.lua.lang.psi.visitor.*; +import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocComment; +import com.sylvanaar.idea.lua.lang.luadoc.psi.impl.LuaDocCommentUtil; +import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaFieldIdentifier; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaKeyValueInitializer; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaTableConstructor; +import com.sylvanaar.idea.lua.lang.psi.impl.LuaStubElementBase; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; +import com.sylvanaar.idea.lua.lang.psi.statements.LuaAssignmentStatement; +import com.sylvanaar.idea.lua.lang.psi.stubs.api.LuaTableStub; +import com.sylvanaar.idea.lua.lang.psi.types.LuaNamespacedType; +import com.sylvanaar.idea.lua.lang.psi.types.LuaTable; +import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import com.sylvanaar.idea.lua.lang.psi.types.StubType; +import com.sylvanaar.idea.lua.lang.psi.util.LuaAssignment; +import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; import consulo.language.psi.util.PsiTreeUtil; +import jakarta.annotation.Nonnull; -import java.util.*; - -import javax.annotation.Nonnull; +import java.util.Map; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaUnaryExpressionImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaUnaryExpressionImpl.java index 7eb4d81a..deea2106 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaUnaryExpressionImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/expressions/LuaUnaryExpressionImpl.java @@ -16,18 +16,18 @@ package com.sylvanaar.idea.lua.lang.psi.impl.expressions; -import javax.annotation.Nonnull; - -import com.sylvanaar.idea.lua.lang.lexer.*; +import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaUnaryExpression; -import com.sylvanaar.idea.lua.lang.psi.types.*; +import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; +import com.sylvanaar.idea.lua.lang.psi.types.LuaType; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; import consulo.language.ast.IElementType; import consulo.language.psi.PsiElementVisitor; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/lists/LuaExpressionListImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/lists/LuaExpressionListImpl.java index 3e41b4f9..b9e48746 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/lists/LuaExpressionListImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/lists/LuaExpressionListImpl.java @@ -16,10 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.impl.lists; -import consulo.language.ast.ASTNode; -import consulo.language.codeStyle.CodeStyleManager; -import consulo.language.psi.PsiElement; -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.impl.expressions.LuaExpressionImpl; @@ -27,7 +23,11 @@ import com.sylvanaar.idea.lua.lang.psi.types.LuaList; import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; -import javax.annotation.Nonnull; +import consulo.language.ast.ASTNode; +import consulo.language.codeStyle.CodeStyleManager; +import consulo.language.psi.PsiElement; +import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/lists/LuaIdentifierListImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/lists/LuaIdentifierListImpl.java index 7d8ad223..99c4c228 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/lists/LuaIdentifierListImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/lists/LuaIdentifierListImpl.java @@ -16,12 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.impl.lists; -import consulo.language.ast.ASTNode; -import consulo.language.psi.PsiElement; -import consulo.language.psi.resolve.ResolveState; -import consulo.language.codeStyle.CodeStyleManager; -import consulo.language.psi.resolve.PsiScopeProcessor; -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; import com.sylvanaar.idea.lua.lang.psi.expressions.Assignable; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaDeclarationExpression; @@ -30,7 +24,13 @@ import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; import com.sylvanaar.idea.lua.util.LuaAtomicNotNullLazyValue; -import javax.annotation.Nonnull; +import consulo.language.ast.ASTNode; +import consulo.language.codeStyle.CodeStyleManager; +import consulo.language.psi.PsiElement; +import consulo.language.psi.resolve.PsiScopeProcessor; +import consulo.language.psi.resolve.ResolveState; +import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; import static com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes.COMMA; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/lists/LuaParameterListImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/lists/LuaParameterListImpl.java index d4fbe08e..7b14a7cd 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/lists/LuaParameterListImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/lists/LuaParameterListImpl.java @@ -16,17 +16,17 @@ package com.sylvanaar.idea.lua.lang.psi.impl.lists; -import consulo.language.ast.ASTNode; -import consulo.language.codeStyle.CodeStyleManager; -import consulo.language.psi.PsiElement; -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; -import com.sylvanaar.idea.lua.lang.psi.lists.LuaParameterList; import com.sylvanaar.idea.lua.lang.psi.impl.LuaPsiElementImpl; import com.sylvanaar.idea.lua.lang.psi.impl.PsiUtil; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaParameterList; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaParameter; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import consulo.language.ast.ASTNode; +import consulo.language.codeStyle.CodeStyleManager; +import consulo.language.psi.PsiElement; +import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import static com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes.COMMA; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaAssignmentStatementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaAssignmentStatementImpl.java index 4875ad33..5e5ca6f3 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaAssignmentStatementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaAssignmentStatementImpl.java @@ -16,16 +16,20 @@ package com.sylvanaar.idea.lua.lang.psi.impl.statements; -import com.sylvanaar.idea.lua.lang.parser.*; -import com.sylvanaar.idea.lua.lang.psi.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.lists.*; -import com.sylvanaar.idea.lua.lang.psi.statements.*; -import com.sylvanaar.idea.lua.lang.psi.symbols.*; +import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; +import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; +import com.sylvanaar.idea.lua.lang.psi.expressions.Assignable; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaIdentifierList; +import com.sylvanaar.idea.lua.lang.psi.statements.LuaAssignmentStatement; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaLocalIdentifier; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.types.InferenceUtil; -import com.sylvanaar.idea.lua.lang.psi.util.*; -import com.sylvanaar.idea.lua.lang.psi.visitor.*; -import com.sylvanaar.idea.lua.util.*; +import com.sylvanaar.idea.lua.lang.psi.util.LuaAssignment; +import com.sylvanaar.idea.lua.lang.psi.util.LuaAssignmentUtil; +import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import com.sylvanaar.idea.lua.util.LuaAtomicNotNullLazyValue; import consulo.language.ast.ASTNode; import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; @@ -34,10 +38,10 @@ import consulo.language.psi.resolve.ResolveState; import consulo.language.psi.util.PsiTreeUtil; import consulo.logging.Logger; +import jakarta.annotation.Nonnull; -import java.util.*; - -import javax.annotation.Nonnull; +import java.util.ArrayList; +import java.util.List; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaBlockImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaBlockImpl.java index ae22da0c..f8eeb253 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaBlockImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaBlockImpl.java @@ -16,17 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.impl.statements; -import javax.annotation.Nonnull; - -import consulo.application.util.CachedValueProvider; -import consulo.application.util.CachedValuesManager; -import consulo.language.ast.ASTNode; -import consulo.language.psi.PsiElement; -import consulo.language.psi.PsiElementVisitor; -import consulo.language.psi.resolve.ResolveState; -import consulo.language.psi.resolve.PsiScopeProcessor; -import consulo.application.util.CachedValue; -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.lang.psi.controlFlow.Instruction; import com.sylvanaar.idea.lua.lang.psi.controlFlow.impl.ControlFlowBuilder; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; @@ -38,6 +27,16 @@ import com.sylvanaar.idea.lua.lang.psi.symbols.LuaIdentifier; import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.application.util.CachedValue; +import consulo.application.util.CachedValueProvider; +import consulo.application.util.CachedValuesManager; +import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiElementVisitor; +import consulo.language.psi.resolve.PsiScopeProcessor; +import consulo.language.psi.resolve.ResolveState; +import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaDoStatementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaDoStatementImpl.java index 9cf16d8d..725c42cc 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaDoStatementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaDoStatementImpl.java @@ -21,8 +21,7 @@ import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElementVisitor; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaFunctionCallStatementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaFunctionCallStatementImpl.java index 82df8106..45e9432a 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaFunctionCallStatementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaFunctionCallStatementImpl.java @@ -16,17 +16,16 @@ package com.sylvanaar.idea.lua.lang.psi.impl.statements; -import javax.annotation.Nonnull; - +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaFunctionCallExpression; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; +import com.sylvanaar.idea.lua.lang.psi.statements.LuaFunctionCallStatement; +import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; -import consulo.language.psi.resolve.ResolveState; import consulo.language.psi.resolve.PsiScopeProcessor; -import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; -import com.sylvanaar.idea.lua.lang.psi.expressions.LuaFunctionCallExpression; -import com.sylvanaar.idea.lua.lang.psi.statements.LuaFunctionCallStatement; -import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.psi.resolve.ResolveState; +import jakarta.annotation.Nonnull; //import com.sylvanaar.idea.Lua.lang.psi.expressions.LuaFunctionIdentifier; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaFunctionDefinitionStatementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaFunctionDefinitionStatementImpl.java index 5596009d..ee4d7604 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaFunctionDefinitionStatementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaFunctionDefinitionStatementImpl.java @@ -16,19 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.impl.statements; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import consulo.document.util.TextRange; -import consulo.navigation.ItemPresentation; -import org.jetbrains.annotations.NonNls; -import consulo.language.ast.ASTNode; -import consulo.logging.Logger; -import consulo.language.psi.PsiElement; -import consulo.language.psi.PsiElementVisitor; -import consulo.language.psi.resolve.ResolveState; -import consulo.language.psi.resolve.PsiScopeProcessor; -import consulo.language.psi.util.PsiTreeUtil; import com.sylvanaar.idea.lua.LuaIcons; import com.sylvanaar.idea.lua.lang.InferenceCapable; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocComment; @@ -48,7 +35,19 @@ import com.sylvanaar.idea.lua.lang.psi.types.LuaType; import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.document.util.TextRange; +import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiElementVisitor; +import consulo.language.psi.resolve.PsiScopeProcessor; +import consulo.language.psi.resolve.ResolveState; +import consulo.language.psi.util.PsiTreeUtil; +import consulo.logging.Logger; +import consulo.navigation.ItemPresentation; import consulo.ui.image.Image; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; +import org.jetbrains.annotations.NonNls; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaGenericForStatementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaGenericForStatementImpl.java index fad89a4a..8d3b5604 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaGenericForStatementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaGenericForStatementImpl.java @@ -16,20 +16,19 @@ package com.sylvanaar.idea.lua.lang.psi.impl.statements; -import consulo.language.psi.PsiElement; -import consulo.language.psi.PsiElementVisitor; -import consulo.language.psi.resolve.PsiScopeProcessor; import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaDeclarationExpression; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; -import com.sylvanaar.idea.lua.lang.psi.lists.*; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; import com.sylvanaar.idea.lua.lang.psi.statements.LuaBlock; import com.sylvanaar.idea.lua.lang.psi.statements.LuaGenericForStatement; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiElementVisitor; +import consulo.language.psi.resolve.PsiScopeProcessor; import consulo.language.psi.resolve.ResolveState; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaIfThenStatementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaIfThenStatementImpl.java index f50f5e02..d0ce8282 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaIfThenStatementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaIfThenStatementImpl.java @@ -16,19 +16,20 @@ package com.sylvanaar.idea.lua.lang.psi.impl.statements; -import com.sylvanaar.idea.lua.lang.parser.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.statements.*; -import com.sylvanaar.idea.lua.lang.psi.visitor.*; +import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaConditionalExpression; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import com.sylvanaar.idea.lua.lang.psi.statements.LuaBlock; +import com.sylvanaar.idea.lua.lang.psi.statements.LuaIfThenStatement; +import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; import consulo.language.psi.util.PsiTreeUtil; import consulo.util.collection.ArrayUtil; +import jakarta.annotation.Nonnull; -import java.util.*; - -import javax.annotation.Nonnull; +import java.util.Arrays; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaLocalDefinitionStatementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaLocalDefinitionStatementImpl.java index 54abfb24..3dd6ae59 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaLocalDefinitionStatementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaLocalDefinitionStatementImpl.java @@ -40,8 +40,8 @@ import consulo.language.psi.resolve.PsiScopeProcessor; import consulo.language.psi.resolve.ResolveState; import consulo.language.psi.util.PsiTreeUtil; +import jakarta.annotation.Nonnull; -import javax.annotation.Nonnull; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaLocalFunctionDefinitionStatementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaLocalFunctionDefinitionStatementImpl.java index 3fdb6638..1546621a 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaLocalFunctionDefinitionStatementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaLocalFunctionDefinitionStatementImpl.java @@ -16,18 +16,19 @@ package com.sylvanaar.idea.lua.lang.psi.impl.statements; -import javax.annotation.Nonnull; - -import com.sylvanaar.idea.lua.lang.psi.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.statements.*; -import com.sylvanaar.idea.lua.lang.psi.symbols.*; -import com.sylvanaar.idea.lua.lang.psi.types.*; -import com.sylvanaar.idea.lua.lang.psi.util.*; +import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; +import com.sylvanaar.idea.lua.lang.psi.expressions.Assignable; +import com.sylvanaar.idea.lua.lang.psi.statements.LuaFunctionDefinitionStatement; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaParameter; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; +import com.sylvanaar.idea.lua.lang.psi.types.LuaFunction; +import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; import consulo.language.psi.resolve.PsiScopeProcessor; import consulo.language.psi.resolve.ResolveState; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaNumericForStatementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaNumericForStatementImpl.java index d5f6d390..5902907c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaNumericForStatementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaNumericForStatementImpl.java @@ -16,18 +16,17 @@ package com.sylvanaar.idea.lua.lang.psi.impl.statements; -import javax.annotation.Nonnull; - -import consulo.language.ast.ASTNode; -import consulo.language.psi.PsiElementVisitor; -import consulo.language.psi.resolve.PsiScopeProcessor; import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.statements.LuaBlock; import com.sylvanaar.idea.lua.lang.psi.statements.LuaNumericForStatement; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiElementVisitor; +import consulo.language.psi.resolve.PsiScopeProcessor; import consulo.language.psi.resolve.ResolveState; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaRepeatStatementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaRepeatStatementImpl.java index 206224e3..d26d55c3 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaRepeatStatementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaRepeatStatementImpl.java @@ -16,15 +16,14 @@ package com.sylvanaar.idea.lua.lang.psi.impl.statements; -import consulo.language.psi.PsiElementVisitor; import com.sylvanaar.idea.lua.lang.psi.LuaPsiToken; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaConditionalExpression; import com.sylvanaar.idea.lua.lang.psi.statements.LuaBlock; import com.sylvanaar.idea.lua.lang.psi.statements.LuaRepeatStatement; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; - -import javax.annotation.Nonnull; +import consulo.language.psi.PsiElementVisitor; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaReturnStatementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaReturnStatementImpl.java index 77393d8a..edc9caec 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaReturnStatementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaReturnStatementImpl.java @@ -16,14 +16,13 @@ package com.sylvanaar.idea.lua.lang.psi.impl.statements; -import consulo.language.psi.PsiElementVisitor; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; import com.sylvanaar.idea.lua.lang.psi.statements.LuaReturnStatement; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; - -import javax.annotation.Nonnull; +import consulo.language.psi.PsiElementVisitor; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaStatementElementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaStatementElementImpl.java index 4e387b5f..9c370835 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaStatementElementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaStatementElementImpl.java @@ -16,13 +16,13 @@ package com.sylvanaar.idea.lua.lang.psi.impl.statements; -import consulo.language.ast.ASTNode; -import consulo.language.psi.PsiElementVisitor; import com.sylvanaar.idea.lua.lang.psi.impl.LuaPsiElementImpl; import com.sylvanaar.idea.lua.lang.psi.statements.LuaStatementElement; import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; -import javax.annotation.Nonnull; +import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElementVisitor; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaWhileStatementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaWhileStatementImpl.java index 92462df3..9ff833fc 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaWhileStatementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/statements/LuaWhileStatementImpl.java @@ -16,15 +16,14 @@ package com.sylvanaar.idea.lua.lang.psi.impl.statements; -import javax.annotation.Nonnull; - -import consulo.language.psi.PsiElementVisitor; import com.sylvanaar.idea.lua.lang.psi.LuaPsiToken; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaConditionalExpression; import com.sylvanaar.idea.lua.lang.psi.statements.LuaBlock; import com.sylvanaar.idea.lua.lang.psi.statements.LuaWhileStatement; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElementVisitor; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaChunkVarargsImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaChunkVarargsImpl.java index 905f6b97..4733ac64 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaChunkVarargsImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaChunkVarargsImpl.java @@ -17,7 +17,7 @@ package com.sylvanaar.idea.lua.lang.psi.impl.symbols; import consulo.language.ast.ASTNode; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaCompoundIdentifierImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaCompoundIdentifierImpl.java index f6cc9be6..800dfa32 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaCompoundIdentifierImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaCompoundIdentifierImpl.java @@ -49,11 +49,10 @@ import consulo.language.psi.util.LanguageCachedValueUtil; import consulo.language.util.IncorrectOperationException; import consulo.project.Project; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - /** * Created by IntelliJ IDEA. * User: Jon S Akhtar diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaCompoundReferenceElementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaCompoundReferenceElementImpl.java index 43d6916c..90c4ff52 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaCompoundReferenceElementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaCompoundReferenceElementImpl.java @@ -16,14 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.impl.symbols; -import javax.annotation.Nonnull; - -import consulo.language.ast.ASTNode; -import consulo.language.psi.PsiReference; -import consulo.navigation.NavigationItem; -import consulo.document.util.TextRange; -import consulo.language.psi.PsiElement; -import consulo.language.psi.PsiElementVisitor; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; @@ -32,8 +24,15 @@ import com.sylvanaar.idea.lua.lang.psi.symbols.LuaGlobal; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.document.util.TextRange; +import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiElementVisitor; +import consulo.language.psi.PsiReference; +import consulo.navigation.NavigationItem; import consulo.util.collection.ArrayUtil; import consulo.util.lang.StringUtil; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaFieldIdentifierImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaFieldIdentifierImpl.java index 958d105d..ff6585bb 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaFieldIdentifierImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaFieldIdentifierImpl.java @@ -16,10 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.impl.symbols; -import consulo.document.util.TextRange; -import consulo.language.ast.ASTNode; -import consulo.language.psi.PsiElement; -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; import com.sylvanaar.idea.lua.lang.psi.expressions.*; import com.sylvanaar.idea.lua.lang.psi.impl.LuaPsiElementFactoryImpl; @@ -35,14 +31,18 @@ import com.sylvanaar.idea.lua.lang.psi.types.*; import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.document.util.TextRange; +import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; import consulo.language.psi.PsiReference; import consulo.language.psi.util.PsiTreeUtil; +import consulo.language.util.IncorrectOperationException; import consulo.project.content.scope.ProjectScopes; import consulo.util.collection.ArrayUtil; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.Collection; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaGlobalDeclarationImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaGlobalDeclarationImpl.java index a4b5e7fc..2623ad73 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaGlobalDeclarationImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaGlobalDeclarationImpl.java @@ -16,13 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.impl.symbols; -import javax.annotation.Nonnull; - -import consulo.language.ast.ASTNode; -import consulo.language.psi.PsiElement; -import consulo.language.psi.PsiReference; -import consulo.language.psi.resolve.PsiScopeProcessor; -import consulo.language.psi.resolve.ResolveState; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; @@ -44,13 +37,18 @@ import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; import com.sylvanaar.idea.lua.lang.psi.util.SymbolUtil; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; +import consulo.language.psi.PsiReference; +import consulo.language.psi.resolve.PsiScopeProcessor; +import consulo.language.psi.resolve.ResolveState; import consulo.language.psi.stub.IStubElementType; import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nullable; - /** * Created by IntelliJ IDEA. * User: Jon S Akhtar diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaGlobalUsageImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaGlobalUsageImpl.java index fdecbca3..7ecfa627 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaGlobalUsageImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaGlobalUsageImpl.java @@ -16,10 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.impl.symbols; -import javax.annotation.Nonnull; - -import consulo.language.ast.ASTNode; -import consulo.language.psi.PsiReference; import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaModuleExpression; import com.sylvanaar.idea.lua.lang.psi.impl.LuaPsiElementFactoryImpl; @@ -28,12 +24,14 @@ import com.sylvanaar.idea.lua.lang.psi.symbols.LuaIdentifier; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.util.SymbolUtil; +import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiReference; import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nullable; - /** * Created by IntelliJ IDEA. * User: Jon S Akhtar diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaIdentifierImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaIdentifierImpl.java index f784017a..830bbcc9 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaIdentifierImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaIdentifierImpl.java @@ -16,11 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.impl.symbols; -import javax.annotation.Nonnull; - -import consulo.language.ast.ASTNode; -import consulo.language.psi.PsiElement; -import consulo.language.psi.PsiElementVisitor; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.statements.LuaAssignmentStatement; import com.sylvanaar.idea.lua.lang.psi.statements.LuaFunctionDefinitionStatement; @@ -29,11 +24,14 @@ import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; +import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiElementVisitor; import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nullable; - //import com.sylvanaar.idea.Lua.lang.psi.expressions.LuaVariable; /** diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaImpliedSelfParameterImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaImpliedSelfParameterImpl.java index 0af5bc35..e3f6ce13 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaImpliedSelfParameterImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaImpliedSelfParameterImpl.java @@ -16,13 +16,13 @@ package com.sylvanaar.idea.lua.lang.psi.impl.symbols; -import consulo.language.ast.ASTNode; import com.sylvanaar.idea.lua.lang.psi.LuaFunctionDefinition; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.statements.LuaFunctionDefinitionStatement; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaCompoundIdentifier; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaParameter; -import javax.annotation.Nonnull; +import consulo.language.ast.ASTNode; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaLocalDeclarationImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaLocalDeclarationImpl.java index dd2af5f4..ccedf94c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaLocalDeclarationImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaLocalDeclarationImpl.java @@ -16,9 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.impl.symbols; -import consulo.language.ast.ASTNode; -import consulo.util.collection.ArrayUtil; -import consulo.util.lang.ref.SoftReference; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaDeclarationExpression; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.impl.LuaPsiElementFactoryImpl; @@ -26,10 +23,12 @@ import com.sylvanaar.idea.lua.lang.psi.symbols.LuaLocalIdentifier; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import consulo.util.collection.ArrayUtil; +import consulo.util.lang.ref.SoftReference; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaLocalIdentifierImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaLocalIdentifierImpl.java index 0b16fef6..2437843c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaLocalIdentifierImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaLocalIdentifierImpl.java @@ -16,15 +16,14 @@ package com.sylvanaar.idea.lua.lang.psi.impl.symbols; -import consulo.language.ast.ASTNode; -import consulo.language.psi.scope.GlobalSearchScope; import com.sylvanaar.idea.lua.lang.psi.impl.LuaPsiElementFactoryImpl; import com.sylvanaar.idea.lua.lang.psi.symbols.*; +import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiReference; +import consulo.language.psi.scope.GlobalSearchScope; import consulo.language.util.IncorrectOperationException; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaParameterImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaParameterImpl.java index 6db80f6d..533aa826 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaParameterImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaParameterImpl.java @@ -15,10 +15,6 @@ */ package com.sylvanaar.idea.lua.lang.psi.impl.symbols; -import javax.annotation.Nonnull; - -import consulo.language.psi.PsiElement; -import consulo.language.psi.PsiElementVisitor; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; import com.sylvanaar.idea.lua.lang.psi.LuaFunctionDefinition; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaDeclarationExpression; @@ -29,8 +25,11 @@ import com.sylvanaar.idea.lua.lang.psi.symbols.LuaUpvalueIdentifier; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiElementVisitor; import consulo.language.psi.resolve.PsiScopeProcessor; import consulo.language.psi.resolve.ResolveState; +import jakarta.annotation.Nonnull; public class LuaParameterImpl extends LuaLocalDeclarationImpl implements LuaParameter { public LuaParameterImpl(@Nonnull diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaPsiDeclarationReferenceElementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaPsiDeclarationReferenceElementImpl.java index c30d4b03..f17105be 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaPsiDeclarationReferenceElementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaPsiDeclarationReferenceElementImpl.java @@ -16,17 +16,19 @@ package com.sylvanaar.idea.lua.lang.psi.impl.symbols; -import javax.annotation.Nonnull; - -import com.sylvanaar.idea.lua.lang.psi.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.types.*; -import com.sylvanaar.idea.lua.lang.psi.util.*; -import com.sylvanaar.idea.lua.lang.psi.visitor.*; +import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaDeclarationExpression; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; +import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import com.sylvanaar.idea.lua.lang.psi.types.LuaTypeUtil; +import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; +import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.language.ast.ASTNode; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiElementVisitor; import consulo.language.psi.PsiReference; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaReferenceElementImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaReferenceElementImpl.java index 82fe5e8f..2f0ac1ef 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaReferenceElementImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaReferenceElementImpl.java @@ -1,15 +1,17 @@ package com.sylvanaar.idea.lua.lang.psi.impl.symbols; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import com.sylvanaar.idea.lua.lang.psi.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.resolve.*; -import com.sylvanaar.idea.lua.lang.psi.symbols.*; -import com.sylvanaar.idea.lua.lang.psi.types.*; -import com.sylvanaar.idea.lua.lang.psi.util.*; -import com.sylvanaar.idea.lua.lang.psi.visitor.*; +import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaDeclarationExpression; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import com.sylvanaar.idea.lua.lang.psi.resolve.LuaResolver; +import com.sylvanaar.idea.lua.lang.psi.resolve.ResolveUtil; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaGlobal; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaIdentifier; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; +import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; +import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; +import com.sylvanaar.idea.lua.lang.psi.visitor.LuaElementVisitor; import consulo.document.util.TextRange; import consulo.language.ast.ASTNode; import consulo.language.psi.*; @@ -17,6 +19,8 @@ import consulo.language.util.IncorrectOperationException; import consulo.project.Project; import consulo.util.lang.StringUtil; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaSymbolImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaSymbolImpl.java index a9a2083a..e7598ff9 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaSymbolImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/impl/symbols/LuaSymbolImpl.java @@ -16,11 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.impl.symbols; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import consulo.navigation.ItemPresentation; -import consulo.language.psi.PsiElement; import com.sylvanaar.idea.lua.LuaIcons; import com.sylvanaar.idea.lua.lang.psi.LuaNamedElement; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; @@ -33,7 +28,11 @@ import com.sylvanaar.idea.lua.lang.psi.types.LuaTypeUtil; import com.sylvanaar.idea.lua.lang.psi.util.LuaPsiUtils; import consulo.language.ast.ASTNode; +import consulo.language.psi.PsiElement; +import consulo.navigation.ItemPresentation; import consulo.ui.image.Image; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/presentation/LuaElementPresentationProvider.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/presentation/LuaElementPresentationProvider.java index 7f97fb9d..f57a2e86 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/presentation/LuaElementPresentationProvider.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/presentation/LuaElementPresentationProvider.java @@ -22,9 +22,8 @@ import consulo.navigation.ItemPresentation; import consulo.navigation.ItemPresentationProvider; import consulo.ui.image.Image; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/LuaResolver.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/LuaResolver.java index 51af827e..c2aa190d 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/LuaResolver.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/LuaResolver.java @@ -1,21 +1,21 @@ package com.sylvanaar.idea.lua.lang.psi.resolve; -import com.sylvanaar.idea.lua.lang.psi.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.resolve.processors.*; -import com.sylvanaar.idea.lua.lang.psi.stubs.index.*; -import com.sylvanaar.idea.lua.lang.psi.symbols.*; -import com.sylvanaar.idea.lua.lang.psi.util.*; +import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaDeclarationExpression; +import com.sylvanaar.idea.lua.lang.psi.resolve.processors.SymbolResolveProcessor; +import com.sylvanaar.idea.lua.lang.psi.stubs.index.LuaGlobalDeclarationIndex; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaLocal; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; +import com.sylvanaar.idea.lua.lang.psi.util.LuaAssignmentUtil; import consulo.language.psi.PsiManager; import consulo.language.psi.resolve.ResolveCache; import consulo.language.psi.resolve.ResolveState; import consulo.language.psi.scope.GlobalSearchScope; import consulo.logging.Logger; import consulo.project.Project; +import jakarta.annotation.Nullable; -import java.util.*; - -import javax.annotation.Nullable; +import java.util.Collection; public class LuaResolver implements ResolveCache.PolyVariantResolver { public static final Logger log = Logger.getInstance("Lua.LuaResolver"); diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/ResolveUtil.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/ResolveUtil.java index a7df2dca..91b903fd 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/ResolveUtil.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/ResolveUtil.java @@ -16,18 +16,17 @@ package com.sylvanaar.idea.lua.lang.psi.resolve; -import consulo.language.psi.PsiElement; -import consulo.language.psi.resolve.ResolveState; -import consulo.language.psi.resolve.PsiScopeProcessor; -import consulo.language.psi.scope.GlobalSearchScope; -import consulo.language.psi.util.PsiTreeUtil; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaDeclarationExpression; import com.sylvanaar.idea.lua.lang.psi.resolve.completion.CompletionProcessor; import com.sylvanaar.idea.lua.lang.psi.stubs.index.LuaGlobalDeclarationIndex; +import consulo.language.psi.PsiElement; +import consulo.language.psi.resolve.PsiScopeProcessor; +import consulo.language.psi.resolve.ResolveState; +import consulo.language.psi.scope.GlobalSearchScope; +import consulo.language.psi.util.PsiTreeUtil; import consulo.project.Project; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import java.util.Collection; import java.util.HashSet; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/completion/CompletionProcessor.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/completion/CompletionProcessor.java index 74f6905e..0f6f49b2 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/completion/CompletionProcessor.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/completion/CompletionProcessor.java @@ -16,16 +16,16 @@ package com.sylvanaar.idea.lua.lang.psi.resolve.completion; -import com.sylvanaar.idea.lua.lang.psi.impl.symbols.*; -import com.sylvanaar.idea.lua.lang.psi.resolve.*; -import com.sylvanaar.idea.lua.lang.psi.resolve.processors.*; -import com.sylvanaar.idea.lua.lang.psi.symbols.*; +import com.sylvanaar.idea.lua.lang.psi.impl.symbols.LuaCompoundReferenceElementImpl; +import com.sylvanaar.idea.lua.lang.psi.resolve.LuaResolveResult; +import com.sylvanaar.idea.lua.lang.psi.resolve.processors.SymbolResolveProcessor; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaCompoundIdentifier; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaLocal; import consulo.language.psi.PsiElement; import consulo.language.psi.resolve.ResolveState; +import jakarta.annotation.Nonnull; -import java.util.*; - -import javax.annotation.Nonnull; +import java.util.Iterator; /** * @author ilyas diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/processors/NamespaceResolveProcessor.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/processors/NamespaceResolveProcessor.java index e77965a3..14ef1a0c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/processors/NamespaceResolveProcessor.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/processors/NamespaceResolveProcessor.java @@ -19,9 +19,8 @@ import consulo.language.psi.PsiElement; import consulo.language.psi.resolve.ResolveState; import consulo.util.dataholder.Key; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/processors/SymbolResolveProcessor.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/processors/SymbolResolveProcessor.java index 54418bda..54310730 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/processors/SymbolResolveProcessor.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/resolve/processors/SymbolResolveProcessor.java @@ -16,10 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.resolve.processors; -import consulo.language.psi.PsiElement; -import consulo.language.psi.resolve.ResolveState; -import consulo.language.psi.StubBasedPsiElement; -import consulo.language.psi.util.PsiTreeUtil; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocSymbolReference; import com.sylvanaar.idea.lua.lang.psi.LuaNamedElement; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; @@ -30,15 +26,18 @@ import com.sylvanaar.idea.lua.lang.psi.symbols.LuaCompoundIdentifier; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaGlobal; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; +import consulo.language.psi.PsiElement; import consulo.language.psi.PsiReference; +import consulo.language.psi.StubBasedPsiElement; +import consulo.language.psi.resolve.ResolveState; +import consulo.language.psi.util.PsiTreeUtil; import consulo.logging.Logger; import consulo.util.dataholder.Key; +import jakarta.annotation.Nonnull; -import javax.annotation.Nonnull; import java.util.HashSet; import java.util.Set; - /** * @author ilyas */ diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/search/LuaSourceFilterScope.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/search/LuaSourceFilterScope.java index 73f2f6c4..4af07c9f 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/search/LuaSourceFilterScope.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/search/LuaSourceFilterScope.java @@ -16,15 +16,14 @@ package com.sylvanaar.idea.lua.lang.psi.search; -import javax.annotation.Nonnull; - +import com.sylvanaar.idea.lua.util.LuaModuleUtil; +import consulo.language.psi.scope.GlobalSearchScope; import consulo.module.Module; +import consulo.module.content.ProjectFileIndex; import consulo.module.content.ProjectRootManager; import consulo.project.Project; -import consulo.module.content.ProjectFileIndex; import consulo.virtualFileSystem.VirtualFile; -import consulo.language.psi.scope.GlobalSearchScope; -import com.sylvanaar.idea.lua.util.LuaModuleUtil; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/statements/LuaAssignmentStatement.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/statements/LuaAssignmentStatement.java index e0ee515c..d16af878 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/statements/LuaAssignmentStatement.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/statements/LuaAssignmentStatement.java @@ -13,11 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - package com.sylvanaar.idea.lua.lang.psi.statements; -import javax.annotation.Nonnull; - import com.sylvanaar.idea.lua.lang.InferenceCapable; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; @@ -26,11 +23,12 @@ import com.sylvanaar.idea.lua.lang.psi.util.LuaAssignment; import consulo.language.ast.IElementType; import consulo.language.psi.PsiElement; - -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; public interface LuaAssignmentStatement extends LuaMaybeDeclarationAssignmentStatement, LuaStatementElement, LuaDeclarationStatement, InferenceCapable { public LuaIdentifierList getLeftExprs(); + public LuaExpressionList getRightExprs(); @Nonnull @@ -38,7 +36,8 @@ public interface LuaAssignmentStatement extends LuaMaybeDeclarationAssignmentSta @Nullable public LuaExpression getAssignedValue(LuaSymbol symbol); - + public IElementType getOperationTokenType(); + public PsiElement getOperatorElement(); } diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/statements/LuaFunctionDefinitionStatement.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/statements/LuaFunctionDefinitionStatement.java index 0274acda..65bc309c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/statements/LuaFunctionDefinitionStatement.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/statements/LuaFunctionDefinitionStatement.java @@ -16,14 +16,13 @@ package com.sylvanaar.idea.lua.lang.psi.statements; -import javax.annotation.Nonnull; - -import com.sylvanaar.idea.lua.lang.*; +import com.sylvanaar.idea.lua.lang.InferenceCapable; import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocCommentOwner; import com.sylvanaar.idea.lua.lang.psi.LuaFunctionDefinition; import com.sylvanaar.idea.lua.lang.psi.LuaNamedElement; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import jakarta.annotation.Nonnull; public interface LuaFunctionDefinitionStatement extends LuaStatementElement, LuaFunctionDefinition, LuaNamedElement, LuaDocCommentOwner, InferenceCapable /*, PsiMethod */ { @Nonnull diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/statements/LuaLocalDefinitionStatement.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/statements/LuaLocalDefinitionStatement.java index 7c93d293..8a8fd469 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/statements/LuaLocalDefinitionStatement.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/statements/LuaLocalDefinitionStatement.java @@ -18,7 +18,7 @@ import com.sylvanaar.idea.lua.lang.psi.expressions.LuaDeclarationExpression; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/LuaFileStubBuilder.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/LuaFileStubBuilder.java index 1292e898..daa06c71 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/LuaFileStubBuilder.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/LuaFileStubBuilder.java @@ -16,13 +16,12 @@ package com.sylvanaar.idea.lua.lang.psi.stubs; -import javax.annotation.Nonnull; - -import com.sylvanaar.idea.lua.lang.psi.*; +import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; import consulo.language.psi.PsiFile; import consulo.language.psi.stub.DefaultStubBuilder; import consulo.language.psi.stub.StubElement; import consulo.logging.Logger; +import jakarta.annotation.Nonnull; public class LuaFileStubBuilder extends DefaultStubBuilder diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/LuaStubElementType.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/LuaStubElementType.java index f4b4eab1..73758e94 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/LuaStubElementType.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/LuaStubElementType.java @@ -16,13 +16,12 @@ package com.sylvanaar.idea.lua.lang.psi.stubs; -import javax.annotation.Nonnull; - -import consulo.language.psi.stub.IStubElementType; -import consulo.language.psi.stub.StubSerializer; import com.sylvanaar.idea.lua.LuaFileType; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; +import consulo.language.psi.stub.IStubElementType; import consulo.language.psi.stub.StubElement; +import consulo.language.psi.stub.StubSerializer; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; /** diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/api/LuaGlobalDeclarationStub.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/api/LuaGlobalDeclarationStub.java index 739cc9f7..f00f4f60 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/api/LuaGlobalDeclarationStub.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/api/LuaGlobalDeclarationStub.java @@ -16,10 +16,9 @@ package com.sylvanaar.idea.lua.lang.psi.stubs.api; -import javax.annotation.Nullable; - -import com.sylvanaar.idea.lua.lang.psi.symbols.*; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaGlobalDeclaration; import consulo.language.psi.stub.NamedStub; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/api/LuaModuleDeclarationStub.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/api/LuaModuleDeclarationStub.java index f37e3a72..3b6660ad 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/api/LuaModuleDeclarationStub.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/api/LuaModuleDeclarationStub.java @@ -16,10 +16,9 @@ package com.sylvanaar.idea.lua.lang.psi.stubs.api; -import javax.annotation.Nullable; - -import consulo.language.psi.stub.NamedStub; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaModuleExpression; +import consulo.language.psi.stub.NamedStub; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/api/LuaTypedStub.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/api/LuaTypedStub.java index 1791f6b9..354834eb 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/api/LuaTypedStub.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/api/LuaTypedStub.java @@ -16,9 +16,8 @@ package com.sylvanaar.idea.lua.lang.psi.stubs.api; -import javax.annotation.Nullable; - -import com.sylvanaar.idea.lua.lang.psi.types.*; +import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaFieldStubType.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaFieldStubType.java index 2687b60a..c77ce60b 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaFieldStubType.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaFieldStubType.java @@ -16,12 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.stubs.elements; -import java.io.IOException; - -import javax.annotation.Nonnull; - -import consulo.index.io.StringRef; -import consulo.language.psi.stub.*; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaFieldIdentifier; import com.sylvanaar.idea.lua.lang.psi.impl.symbols.LuaFieldIdentifierImpl; import com.sylvanaar.idea.lua.lang.psi.stubs.LuaStubElementType; @@ -30,7 +24,12 @@ import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; import com.sylvanaar.idea.lua.util.LuaSerializationUtils; +import consulo.index.io.StringRef; +import consulo.language.psi.stub.*; import consulo.util.lang.Pair; +import jakarta.annotation.Nonnull; + +import java.io.IOException; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaStubCompoundIdentifierType.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaStubCompoundIdentifierType.java index f0c0774a..f1e7793b 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaStubCompoundIdentifierType.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaStubCompoundIdentifierType.java @@ -16,12 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.stubs.elements; -import java.io.IOException; - -import javax.annotation.Nonnull; - -import consulo.language.psi.stub.StubOutputStream; -import consulo.index.io.StringRef; import com.sylvanaar.idea.lua.lang.psi.impl.symbols.LuaCompoundIdentifierImpl; import com.sylvanaar.idea.lua.lang.psi.stubs.LuaStubElementType; import com.sylvanaar.idea.lua.lang.psi.stubs.LuaStubUtils; @@ -32,10 +26,15 @@ import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; import com.sylvanaar.idea.lua.util.LuaSerializationUtils; +import consulo.index.io.StringRef; import consulo.language.psi.stub.IndexSink; import consulo.language.psi.stub.StubElement; import consulo.language.psi.stub.StubInputStream; +import consulo.language.psi.stub.StubOutputStream; import consulo.util.lang.Pair; +import jakarta.annotation.Nonnull; + +import java.io.IOException; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaStubGlobalDeclarationType.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaStubGlobalDeclarationType.java index e1df3cee..f57ba409 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaStubGlobalDeclarationType.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaStubGlobalDeclarationType.java @@ -15,16 +15,6 @@ */ package com.sylvanaar.idea.lua.lang.psi.stubs.elements; -import java.io.IOException; - -import javax.annotation.Nonnull; - -import consulo.index.io.StringRef; -import consulo.logging.Logger; -import consulo.language.psi.stub.IndexSink; -import consulo.language.psi.stub.StubElement; -import consulo.language.psi.stub.StubInputStream; -import consulo.language.psi.stub.StubOutputStream; import com.sylvanaar.idea.lua.lang.psi.impl.symbols.LuaGlobalDeclarationImpl; import com.sylvanaar.idea.lua.lang.psi.stubs.LuaStubElementType; import com.sylvanaar.idea.lua.lang.psi.stubs.LuaStubUtils; @@ -35,8 +25,17 @@ import com.sylvanaar.idea.lua.lang.psi.types.LuaPrimitiveType; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; import com.sylvanaar.idea.lua.util.LuaSerializationUtils; +import consulo.index.io.StringRef; +import consulo.language.psi.stub.IndexSink; +import consulo.language.psi.stub.StubElement; +import consulo.language.psi.stub.StubInputStream; +import consulo.language.psi.stub.StubOutputStream; +import consulo.logging.Logger; import consulo.util.lang.Pair; import consulo.util.lang.StringUtil; +import jakarta.annotation.Nonnull; + +import java.io.IOException; /** diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaStubModuleDeclarationType.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaStubModuleDeclarationType.java index 702ff815..f2c80cee 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaStubModuleDeclarationType.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaStubModuleDeclarationType.java @@ -16,16 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.stubs.elements; -import java.io.IOException; - -import javax.annotation.Nonnull; - -import consulo.language.psi.stub.IndexSink; -import consulo.language.psi.stub.StubInputStream; -import consulo.util.lang.StringUtil; -import consulo.language.psi.stub.StubElement; -import consulo.language.psi.stub.StubOutputStream; -import consulo.index.io.StringRef; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaModuleExpression; import com.sylvanaar.idea.lua.lang.psi.impl.expressions.LuaModuleExpressionImpl; import com.sylvanaar.idea.lua.lang.psi.stubs.LuaStubElementType; @@ -33,7 +23,16 @@ import com.sylvanaar.idea.lua.lang.psi.stubs.impl.LuaModuleDeclarationStubImpl; import com.sylvanaar.idea.lua.lang.psi.stubs.index.LuaGlobalDeclarationIndex; import com.sylvanaar.idea.lua.util.LuaSerializationUtils; +import consulo.index.io.StringRef; +import consulo.language.psi.stub.IndexSink; +import consulo.language.psi.stub.StubElement; +import consulo.language.psi.stub.StubInputStream; +import consulo.language.psi.stub.StubOutputStream; import consulo.logging.Logger; +import consulo.util.lang.StringUtil; +import jakarta.annotation.Nonnull; + +import java.io.IOException; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaTableStubType.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaTableStubType.java index 0f6006f1..104b6728 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaTableStubType.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/elements/LuaTableStubType.java @@ -16,11 +16,6 @@ package com.sylvanaar.idea.lua.lang.psi.stubs.elements; -import java.io.IOException; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - import com.sylvanaar.idea.lua.lang.psi.expressions.LuaTableConstructor; import com.sylvanaar.idea.lua.lang.psi.impl.expressions.LuaTableConstructorImpl; import com.sylvanaar.idea.lua.lang.psi.stubs.LuaStubElementType; @@ -29,6 +24,10 @@ import com.sylvanaar.idea.lua.lang.psi.types.LuaTable; import com.sylvanaar.idea.lua.util.LuaSerializationUtils; import consulo.language.psi.stub.*; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; + +import java.io.IOException; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/impl/LuaFieldStub.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/impl/LuaFieldStub.java index 6c8afb95..092f0d60 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/impl/LuaFieldStub.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/impl/LuaFieldStub.java @@ -16,14 +16,14 @@ package com.sylvanaar.idea.lua.lang.psi.stubs.impl; -import consulo.language.psi.stub.NamedStubBase; -import consulo.language.psi.stub.StubElement; -import consulo.index.io.StringRef; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaFieldIdentifier; import com.sylvanaar.idea.lua.lang.psi.stubs.api.LuaTypedStub; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; -import javax.annotation.Nullable; +import consulo.index.io.StringRef; +import consulo.language.psi.stub.NamedStubBase; +import consulo.language.psi.stub.StubElement; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/impl/LuaGlobalDeclarationStubImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/impl/LuaGlobalDeclarationStubImpl.java index 552f2312..f9c5b3ae 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/impl/LuaGlobalDeclarationStubImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/impl/LuaGlobalDeclarationStubImpl.java @@ -16,16 +16,15 @@ package com.sylvanaar.idea.lua.lang.psi.stubs.impl; -import consulo.language.psi.stub.NamedStubBase; -import consulo.language.psi.stub.StubElement; -import consulo.index.io.StringRef; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; import com.sylvanaar.idea.lua.lang.psi.stubs.api.LuaGlobalDeclarationStub; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaGlobalDeclaration; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import consulo.index.io.StringRef; import consulo.language.psi.stub.IStubElementType; - -import javax.annotation.Nullable; +import consulo.language.psi.stub.NamedStubBase; +import consulo.language.psi.stub.StubElement; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/impl/LuaModuleDeclarationStubImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/impl/LuaModuleDeclarationStubImpl.java index 96f5e7d6..1240d58c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/impl/LuaModuleDeclarationStubImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/impl/LuaModuleDeclarationStubImpl.java @@ -16,17 +16,15 @@ package com.sylvanaar.idea.lua.lang.psi.stubs.impl; -import javax.annotation.Nonnull; - -import consulo.language.psi.stub.StubElement; -import consulo.index.io.StringRef; import com.sylvanaar.idea.lua.lang.parser.LuaElementTypes; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaModuleExpression; import com.sylvanaar.idea.lua.lang.psi.stubs.api.LuaModuleDeclarationStub; import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import consulo.index.io.StringRef; import consulo.language.psi.stub.NamedStubBase; - -import javax.annotation.Nullable; +import consulo.language.psi.stub.StubElement; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/index/LuaGlobalDeclarationIndex.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/index/LuaGlobalDeclarationIndex.java index 0dd7dcf9..0fe2c1bb 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/index/LuaGlobalDeclarationIndex.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/stubs/index/LuaGlobalDeclarationIndex.java @@ -20,8 +20,7 @@ import consulo.annotation.component.ExtensionImpl; import consulo.language.psi.stub.StringStubIndexExtension; import consulo.language.psi.stub.StubIndexKey; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/symbols/LuaAlias.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/symbols/LuaAlias.java index 71b56be1..358df447 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/symbols/LuaAlias.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/symbols/LuaAlias.java @@ -16,9 +16,9 @@ package com.sylvanaar.idea.lua.lang.psi.symbols; -import consulo.language.psi.PsiElement; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; -import javax.annotation.Nullable; +import consulo.language.psi.PsiElement; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/symbols/LuaGlobal.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/symbols/LuaGlobal.java index ea16a113..8b195c2d 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/symbols/LuaGlobal.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/symbols/LuaGlobal.java @@ -16,7 +16,7 @@ package com.sylvanaar.idea.lua.lang.psi.symbols; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/types/LuaPrimitiveTypeImpl.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/types/LuaPrimitiveTypeImpl.java index b6a8548b..452a8c19 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/types/LuaPrimitiveTypeImpl.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/types/LuaPrimitiveTypeImpl.java @@ -16,7 +16,7 @@ package com.sylvanaar.idea.lua.lang.psi.types; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import java.util.Map; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaAssignment.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaAssignment.java index b6eb64c2..9fb907f5 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaAssignment.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaAssignment.java @@ -16,12 +16,11 @@ package com.sylvanaar.idea.lua.lang.psi.util; -import javax.annotation.Nonnull; - -import consulo.util.lang.StringUtil; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; +import consulo.util.lang.StringUtil; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaAssignmentUtil.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaAssignmentUtil.java index bacc78ea..e10fab70 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaAssignmentUtil.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaAssignmentUtil.java @@ -16,20 +16,23 @@ package com.sylvanaar.idea.lua.lang.psi.util; -import com.sylvanaar.idea.lua.lang.psi.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.impl.statements.*; -import com.sylvanaar.idea.lua.lang.psi.lists.*; -import com.sylvanaar.idea.lua.lang.psi.statements.*; -import com.sylvanaar.idea.lua.lang.psi.symbols.*; -import com.sylvanaar.idea.lua.lang.psi.types.*; -import com.sylvanaar.idea.lua.util.*; +import com.sylvanaar.idea.lua.lang.psi.LuaPsiElementFactory; +import com.sylvanaar.idea.lua.lang.psi.expressions.Assignable; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import com.sylvanaar.idea.lua.lang.psi.impl.statements.LuaAssignmentStatementImpl; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaExpressionList; +import com.sylvanaar.idea.lua.lang.psi.lists.LuaIdentifierList; +import com.sylvanaar.idea.lua.lang.psi.statements.LuaAssignmentStatement; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaAlias; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; +import com.sylvanaar.idea.lua.lang.psi.types.LuaType; +import com.sylvanaar.idea.lua.lang.psi.types.LuaTypeUtil; +import com.sylvanaar.idea.lua.util.LuaAtomicNotNullLazyValue; import consulo.language.psi.util.PsiTreeUtil; import consulo.project.Project; +import jakarta.annotation.Nonnull; -import java.util.*; - -import javax.annotation.Nonnull; +import java.util.List; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaPsiUtils.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaPsiUtils.java index f486c9ea..9e5cbaaa 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaPsiUtils.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaPsiUtils.java @@ -15,22 +15,6 @@ */ package com.sylvanaar.idea.lua.lang.psi.util; -import java.util.Collection; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - -import consulo.language.ast.ASTNode; -import consulo.language.ast.IElementType; -import consulo.language.psi.resolve.ResolveState; -import consulo.language.psi.util.PsiTreeUtil; -import consulo.navigation.ItemPresentation; -import consulo.document.util.TextRange; -import consulo.language.file.FileViewProvider; -import consulo.language.psi.PsiElement; -import consulo.language.psi.PsiErrorElement; -import consulo.language.psi.resolve.PsiScopeProcessor; -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.LuaIcons; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; @@ -48,7 +32,22 @@ import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.types.LuaFunction; import com.sylvanaar.idea.lua.lang.psi.visitor.LuaRecursiveElementVisitor; +import consulo.document.util.TextRange; +import consulo.language.ast.ASTNode; +import consulo.language.ast.IElementType; +import consulo.language.file.FileViewProvider; +import consulo.language.psi.PsiElement; +import consulo.language.psi.PsiErrorElement; +import consulo.language.psi.resolve.PsiScopeProcessor; +import consulo.language.psi.resolve.ResolveState; +import consulo.language.psi.util.PsiTreeUtil; +import consulo.language.util.IncorrectOperationException; +import consulo.navigation.ItemPresentation; import consulo.ui.image.Image; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; + +import java.util.Collection; /** diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaStatementOwner.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaStatementOwner.java index 4943f22c..662dda75 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaStatementOwner.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/util/LuaStatementOwner.java @@ -16,11 +16,10 @@ package com.sylvanaar.idea.lua.lang.psi.util; -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; import com.sylvanaar.idea.lua.lang.psi.statements.LuaStatementElement; -import javax.annotation.Nonnull; - +import consulo.language.util.IncorrectOperationException; +import jakarta.annotation.Nonnull; /** * @author ilyas diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/psi/visitor/LuaElementVisitor.java b/src/main/java/com/sylvanaar/idea/lua/lang/psi/visitor/LuaElementVisitor.java index ab1bc718..103ea1b9 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/psi/visitor/LuaElementVisitor.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/psi/visitor/LuaElementVisitor.java @@ -16,18 +16,25 @@ package com.sylvanaar.idea.lua.lang.psi.visitor; -import javax.annotation.Nonnull; - -import com.sylvanaar.idea.lua.lang.luadoc.psi.api.*; -import com.sylvanaar.idea.lua.lang.psi.*; +import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocFieldReference; +import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocPsiElement; +import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocReferenceElement; +import com.sylvanaar.idea.lua.lang.luadoc.psi.api.LuaDocTag; +import com.sylvanaar.idea.lua.lang.psi.LuaPsiElement; +import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.lang.psi.impl.*; -import com.sylvanaar.idea.lua.lang.psi.impl.statements.*; -import com.sylvanaar.idea.lua.lang.psi.impl.symbols.*; +import com.sylvanaar.idea.lua.lang.psi.impl.LuaPsiKeywordImpl; +import com.sylvanaar.idea.lua.lang.psi.impl.LuaPsiTokenImpl; +import com.sylvanaar.idea.lua.lang.psi.impl.statements.LuaRepeatStatementImpl; +import com.sylvanaar.idea.lua.lang.psi.impl.symbols.LuaCompoundReferenceElementImpl; +import com.sylvanaar.idea.lua.lang.psi.impl.symbols.LuaPsiDeclarationReferenceElementImpl; import com.sylvanaar.idea.lua.lang.psi.statements.*; -import com.sylvanaar.idea.lua.lang.psi.symbols.*; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaCompoundIdentifier; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaIdentifier; +import com.sylvanaar.idea.lua.lang.psi.symbols.LuaParameter; import consulo.application.progress.ProgressIndicatorProvider; import consulo.language.psi.PsiElementVisitor; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/structure/LuaStructureViewFactory.java b/src/main/java/com/sylvanaar/idea/lua/lang/structure/LuaStructureViewFactory.java index 27dbfa6e..e77b1fed 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/structure/LuaStructureViewFactory.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/structure/LuaStructureViewFactory.java @@ -26,9 +26,8 @@ import consulo.language.Language; import consulo.language.editor.structureView.PsiStructureViewFactory; import consulo.language.psi.PsiFile; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/structure/LuaStructureViewModel.java b/src/main/java/com/sylvanaar/idea/lua/lang/structure/LuaStructureViewModel.java index d27aee14..7d1942aa 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/structure/LuaStructureViewModel.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/structure/LuaStructureViewModel.java @@ -16,16 +16,14 @@ package com.sylvanaar.idea.lua.lang.structure; -import javax.annotation.Nonnull; - -import consulo.fileEditor.structureView.tree.Sorter; -import consulo.language.psi.PsiFile; - import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; import com.sylvanaar.idea.lua.lang.psi.statements.LuaFunctionDefinitionStatement; import com.sylvanaar.idea.lua.lang.structure.impl.LuaFileStructureViewElement; import consulo.fileEditor.structureView.StructureViewTreeElement; +import consulo.fileEditor.structureView.tree.Sorter; import consulo.language.editor.structureView.TextEditorBasedStructureViewModel; +import consulo.language.psi.PsiFile; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/structure/itemsPresentations/LuaItemPresentation.java b/src/main/java/com/sylvanaar/idea/lua/lang/structure/itemsPresentations/LuaItemPresentation.java index e2d95c88..e4f31e54 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/structure/itemsPresentations/LuaItemPresentation.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/structure/itemsPresentations/LuaItemPresentation.java @@ -15,11 +15,9 @@ */ package com.sylvanaar.idea.lua.lang.structure.itemsPresentations; -import javax.annotation.Nullable; - -import consulo.navigation.ItemPresentation; import consulo.language.psi.PsiElement; - +import consulo.navigation.ItemPresentation; +import jakarta.annotation.Nullable; public abstract class LuaItemPresentation implements ItemPresentation { protected final PsiElement myElement; diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/structure/itemsPresentations/impl/LuaFileItemPresentation.java b/src/main/java/com/sylvanaar/idea/lua/lang/structure/itemsPresentations/impl/LuaFileItemPresentation.java index 97f8376f..5e04972b 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/structure/itemsPresentations/impl/LuaFileItemPresentation.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/structure/itemsPresentations/impl/LuaFileItemPresentation.java @@ -15,14 +15,12 @@ */ package com.sylvanaar.idea.lua.lang.structure.itemsPresentations.impl; -import javax.annotation.Nullable; - import com.sylvanaar.idea.lua.lang.psi.LuaPsiFile; import com.sylvanaar.idea.lua.lang.structure.LuaElementPresentation; import com.sylvanaar.idea.lua.lang.structure.itemsPresentations.LuaItemPresentation; import consulo.language.icon.IconDescriptorUpdaters; import consulo.ui.image.Image; - +import jakarta.annotation.Nullable; public class LuaFileItemPresentation extends LuaItemPresentation { public LuaFileItemPresentation(LuaPsiFile myElement) { diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/structure/itemsPresentations/impl/LuaFunctionItemPresentation.java b/src/main/java/com/sylvanaar/idea/lua/lang/structure/itemsPresentations/impl/LuaFunctionItemPresentation.java index 4f499871..5699ccaf 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/structure/itemsPresentations/impl/LuaFunctionItemPresentation.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/structure/itemsPresentations/impl/LuaFunctionItemPresentation.java @@ -22,10 +22,8 @@ import consulo.application.util.NotNullLazyValue; import consulo.colorScheme.TextAttributesKey; import consulo.ui.image.Image; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; - +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; public class LuaFunctionItemPresentation extends LuaItemPresentation { diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/template/LuaFileMacro.java b/src/main/java/com/sylvanaar/idea/lua/lang/template/LuaFileMacro.java index ec6927dc..88bbc915 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/template/LuaFileMacro.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/template/LuaFileMacro.java @@ -26,8 +26,7 @@ import consulo.language.editor.template.macro.Macro; import consulo.language.psi.PsiDocumentManager; import consulo.language.psi.PsiFile; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/template/LuaFunctionMacro.java b/src/main/java/com/sylvanaar/idea/lua/lang/template/LuaFunctionMacro.java index 3e9aede0..89b33d5f 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/template/LuaFunctionMacro.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/template/LuaFunctionMacro.java @@ -30,8 +30,7 @@ import consulo.language.psi.PsiDocumentManager; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/lang/template/LuaTemplateContextType.java b/src/main/java/com/sylvanaar/idea/lua/lang/template/LuaTemplateContextType.java index e64812e1..7531dc2e 100644 --- a/src/main/java/com/sylvanaar/idea/lua/lang/template/LuaTemplateContextType.java +++ b/src/main/java/com/sylvanaar/idea/lua/lang/template/LuaTemplateContextType.java @@ -20,14 +20,14 @@ import com.sylvanaar.idea.lua.editor.highlighter.LuaSyntaxHighlighter; import consulo.annotation.component.ExtensionImpl; import consulo.language.editor.highlight.SyntaxHighlighter; -import consulo.language.editor.template.context.TemplateContextType; +import consulo.language.editor.template.context.BaseTemplateContextType; import consulo.language.editor.util.PsiUtilBase; import consulo.language.psi.PsiComment; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; import consulo.language.psi.util.PsiTreeUtil; - -import javax.annotation.Nonnull; +import consulo.localize.LocalizeValue; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. @@ -36,9 +36,9 @@ * Time: 10:45 PM */ @ExtensionImpl -public class LuaTemplateContextType extends TemplateContextType { +public class LuaTemplateContextType extends BaseTemplateContextType { public LuaTemplateContextType() { - super("LUA", "Lua"); + super("LUA", LocalizeValue.localizeTODO("Lua")); } public boolean isInContext(@Nonnull PsiFile file, int offset) { diff --git a/src/main/java/com/sylvanaar/idea/lua/library/LuaLibraryType.java b/src/main/java/com/sylvanaar/idea/lua/library/LuaLibraryType.java index aee032a2..43702ccf 100644 --- a/src/main/java/com/sylvanaar/idea/lua/library/LuaLibraryType.java +++ b/src/main/java/com/sylvanaar/idea/lua/library/LuaLibraryType.java @@ -34,9 +34,9 @@ import consulo.project.Project; import consulo.ui.image.Image; import consulo.virtualFileSystem.VirtualFile; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import javax.swing.*; import java.util.List; diff --git a/src/main/java/com/sylvanaar/idea/lua/luaj/LuaJInterpreter.java b/src/main/java/com/sylvanaar/idea/lua/luaj/LuaJInterpreter.java index bf7ee6da..b1f7be30 100644 --- a/src/main/java/com/sylvanaar/idea/lua/luaj/LuaJInterpreter.java +++ b/src/main/java/com/sylvanaar/idea/lua/luaj/LuaJInterpreter.java @@ -16,16 +16,12 @@ package com.sylvanaar.idea.lua.luaj; -import consulo.execution.ui.console.ConsoleViewContentType; import consulo.application.ApplicationManager; import consulo.colorScheme.EditorColorsManager; -import consulo.ui.ex.awtUnsafe.TargetAWT; +import consulo.execution.ui.console.ConsoleViewContentType; import consulo.ui.color.ColorValue; +import consulo.ui.ex.awtUnsafe.TargetAWT; import jsyntaxpane.lexers.LuaLexer; -import org.luaj.vm2.Globals; -import org.luaj.vm2.LuaError; -import org.luaj.vm2.LuaValue; -import org.luaj.vm2.lib.jse.JsePlatform; import se.krka.kahlua.j2se.interpreter.History; import se.krka.kahlua.j2se.interpreter.InputTerminal; import se.krka.kahlua.j2se.interpreter.OutputTerminal; @@ -36,11 +32,14 @@ import java.awt.*; import java.awt.event.*; import java.io.ByteArrayOutputStream; -import java.io.PrintStream; -import java.nio.charset.StandardCharsets; import java.util.concurrent.Future; import java.util.concurrent.FutureTask; +//import org.luaj.vm2.Globals; +//import org.luaj.vm2.LuaError; +//import org.luaj.vm2.LuaValue; +//import org.luaj.vm2.lib.jse.JsePlatform; + /** * Created by IntelliJ IDEA. * User: Jon S Akhtar @@ -55,7 +54,7 @@ public class LuaJInterpreter extends JPanel private History history = new History(); private Future future; - private Globals _G; +// private Globals _G; public LuaJInterpreter() { @@ -64,7 +63,7 @@ public LuaJInterpreter() JSyntaxUtil.setup(); // create a Lua engine - _G = JsePlatform.debugGlobals(); +// _G = JsePlatform.debugGlobals(); ColorValue consoleColor = EditorColorsManager.getInstance().getGlobalScheme().getColor(ConsoleViewContentType.CONSOLE_BACKGROUND_KEY); @@ -204,16 +203,16 @@ public void run() final ByteArrayOutputStream outputStream = new ByteArrayOutputStream(); // evaluate Lua code from String - final PrintStream stdout = _G.STDOUT; - _G.STDOUT = new PrintStream(outputStream); - _G.get("load").call(LuaValue.valueOf(text)).call(); - - print(new String(outputStream.toByteArray(), StandardCharsets.UTF_8)); - _G.STDOUT = stdout; - } - catch(LuaError e) - { - printError(e); +// final PrintStream stdout = _G.STDOUT; +// _G.STDOUT = new PrintStream(outputStream); +// _G.get("load").call(LuaValue.valueOf(text)).call(); +// +// print(new String(outputStream.toByteArray(), StandardCharsets.UTF_8)); +// _G.STDOUT = stdout; +// } +// catch(LuaError e) +// { +// printError(e); } finally { diff --git a/src/main/java/com/sylvanaar/idea/lua/options/LuaOptionsPanel.java b/src/main/java/com/sylvanaar/idea/lua/options/LuaOptionsPanel.java index 43a0e65f..80d38d3d 100644 --- a/src/main/java/com/sylvanaar/idea/lua/options/LuaOptionsPanel.java +++ b/src/main/java/com/sylvanaar/idea/lua/options/LuaOptionsPanel.java @@ -16,17 +16,15 @@ package com.sylvanaar.idea.lua.options; -import javax.swing.JCheckBox; -import javax.swing.JComponent; -import javax.swing.JPanel; - import consulo.configurable.BaseConfigurable; -import org.jetbrains.annotations.Nls; import consulo.configurable.Configurable; +import consulo.language.psi.PsiManager; +import consulo.localize.LocalizeValue; import consulo.project.Project; import consulo.project.ProjectManager; -import consulo.language.psi.PsiManager; -import com.sylvanaar.idea.lua.LuaFileType; +import org.jetbrains.annotations.Nls; + +import javax.swing.*; /** * Created by IntelliJ IDEA. @@ -77,9 +75,9 @@ public void disposeUIResources() @Nls @Override - public String getDisplayName() + public LocalizeValue getDisplayName() { - return LuaFileType.LUA; + return LocalizeValue.localizeTODO("Lua"); } @Override diff --git a/src/main/java/com/sylvanaar/idea/lua/projectView/nodes/LuaFunctionNode.java b/src/main/java/com/sylvanaar/idea/lua/projectView/nodes/LuaFunctionNode.java index d8bf5e4b..64d8179e 100644 --- a/src/main/java/com/sylvanaar/idea/lua/projectView/nodes/LuaFunctionNode.java +++ b/src/main/java/com/sylvanaar/idea/lua/projectView/nodes/LuaFunctionNode.java @@ -15,19 +15,18 @@ */ package com.sylvanaar.idea.lua.projectView.nodes; -import consulo.project.ui.view.tree.AbstractTreeNode; -import consulo.project.ui.view.tree.ViewSettings; -import consulo.ui.ex.tree.PresentationData; -import consulo.project.Project; import com.sylvanaar.idea.lua.lang.psi.LuaFunctionDefinition; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.util.SymbolUtil; +import consulo.project.Project; +import consulo.project.ui.view.tree.AbstractTreeNode; +import consulo.project.ui.view.tree.ViewSettings; +import consulo.ui.ex.tree.PresentationData; import consulo.util.lang.StringUtil; +import jakarta.annotation.Nullable; import java.util.Collection; -import javax.annotation.Nullable; - public class LuaFunctionNode extends BasePsiMemberNode { public LuaFunctionNode(Project project, LuaFunctionDefinition value, ViewSettings viewSettings) { super(project, value, viewSettings); diff --git a/src/main/java/com/sylvanaar/idea/lua/refactoring/LuaNameSuggestionProvider.java b/src/main/java/com/sylvanaar/idea/lua/refactoring/LuaNameSuggestionProvider.java index 18af1919..7c13729e 100644 --- a/src/main/java/com/sylvanaar/idea/lua/refactoring/LuaNameSuggestionProvider.java +++ b/src/main/java/com/sylvanaar/idea/lua/refactoring/LuaNameSuggestionProvider.java @@ -16,14 +16,13 @@ package com.sylvanaar.idea.lua.refactoring; -import consulo.language.editor.refactoring.rename.SuggestedNameInfo; import consulo.language.editor.refactoring.rename.NameSuggestionProvider; +import consulo.language.editor.refactoring.rename.SuggestedNameInfo; import consulo.language.psi.PsiElement; +import jakarta.annotation.Nullable; import java.util.Set; -import javax.annotation.Nullable; - /** * Created by IntelliJ IDEA. * User: Jon S Akhtar diff --git a/src/main/java/com/sylvanaar/idea/lua/refactoring/LuaRefactoringUtil.java b/src/main/java/com/sylvanaar/idea/lua/refactoring/LuaRefactoringUtil.java index 74c23122..e136d717 100644 --- a/src/main/java/com/sylvanaar/idea/lua/refactoring/LuaRefactoringUtil.java +++ b/src/main/java/com/sylvanaar/idea/lua/refactoring/LuaRefactoringUtil.java @@ -16,23 +16,23 @@ package com.sylvanaar.idea.lua.refactoring; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Comparator; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; -import consulo.language.editor.PsiEquivalenceUtil; -import consulo.language.lexer.Lexer; -import consulo.language.psi.PsiElement; -import consulo.language.psi.util.PsiTreeUtil; -import consulo.language.editor.util.PsiUtilBase; import com.sylvanaar.idea.lua.lang.lexer.LuaLexer; import com.sylvanaar.idea.lua.lang.lexer.LuaTokenTypes; import com.sylvanaar.idea.lua.lang.psi.LuaPsiFileBase; import com.sylvanaar.idea.lua.lang.psi.statements.LuaBlock; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaParameter; +import consulo.language.editor.PsiEquivalenceUtil; +import consulo.language.editor.util.PsiUtilBase; +import consulo.language.lexer.Lexer; +import consulo.language.psi.PsiElement; +import consulo.language.psi.util.PsiTreeUtil; import consulo.util.lang.reflect.ReflectionUtil; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Comparator; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceContext.java b/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceContext.java index acd7f40c..6c77f2d9 100644 --- a/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceContext.java +++ b/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceContext.java @@ -15,15 +15,13 @@ */ package com.sylvanaar.idea.lua.refactoring.introduce; -import javax.annotation.Nonnull; - -import consulo.codeEditor.Editor; -import consulo.project.Project; -import consulo.language.psi.PsiElement; import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; - -import javax.annotation.Nullable; +import consulo.codeEditor.Editor; +import consulo.language.psi.PsiElement; +import consulo.project.Project; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * @author Maxim.Medvedev diff --git a/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceDialog.java b/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceDialog.java index 4cc53ef3..e0938eb7 100644 --- a/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceDialog.java +++ b/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceDialog.java @@ -15,7 +15,7 @@ */ package com.sylvanaar.idea.lua.refactoring.introduce; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * @author Maxim.Medvedev diff --git a/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceHandlerBase.java b/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceHandlerBase.java index da5b824e..cf36156e 100644 --- a/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceHandlerBase.java +++ b/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceHandlerBase.java @@ -29,32 +29,30 @@ import com.sylvanaar.idea.lua.lang.psi.symbols.LuaParameter; import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.refactoring.LuaRefactoringUtil; +import consulo.annotation.access.RequiredReadAction; import consulo.application.ApplicationManager; import consulo.application.util.function.Computable; import consulo.codeEditor.Editor; import consulo.codeEditor.EditorColors; import consulo.codeEditor.SelectionModel; import consulo.codeEditor.markup.RangeHighlighter; -import consulo.colorScheme.EditorColorsManager; -import consulo.colorScheme.TextAttributes; import consulo.dataContext.DataContext; import consulo.document.Document; import consulo.document.util.TextRange; import consulo.language.editor.highlight.HighlightManager; -import consulo.language.editor.refactoring.IntroduceTargetChooser; import consulo.language.editor.refactoring.RefactoringBundle; import consulo.language.editor.refactoring.action.RefactoringActionHandler; +import consulo.language.editor.refactoring.introduce.IntroduceTargetChooser; import consulo.language.editor.refactoring.util.CommonRefactoringUtil; import consulo.language.psi.PsiDocumentManager; import consulo.language.psi.PsiElement; import consulo.language.psi.PsiFile; import consulo.language.psi.util.PsiTreeUtil; import consulo.project.Project; -import consulo.project.ui.wm.WindowManager; import consulo.undoRedo.CommandProcessor; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.util.ArrayList; import java.util.List; import java.util.function.Consumer; @@ -310,17 +308,15 @@ public static LuaExpression findExpression(LuaPsiFileBase file, int startOffset, } @Nullable + @RequiredReadAction private Settings showDialog(LuaIntroduceContext context) { - - // Add occurences highlighting - ArrayList highlighters = new ArrayList(); + // Add occurrences highlighting + List highlighters = new ArrayList(); HighlightManager highlightManager = null; if (context.editor != null) { highlightManager = HighlightManager.getInstance(context.project); - EditorColorsManager colorsManager = EditorColorsManager.getInstance(); - TextAttributes attributes = colorsManager.getGlobalScheme().getAttributes(EditorColors.SEARCH_RESULT_ATTRIBUTES); if (context.occurrences.length > 1) { - highlightManager.addOccurrenceHighlights(context.editor, context.occurrences, attributes, true, highlighters); + highlightManager.addOccurrenceHighlights(context.editor, context.occurrences, EditorColors.SEARCH_RESULT_ATTRIBUTES, true, highlighters); } } @@ -338,8 +334,8 @@ private Settings showDialog(LuaIntroduceContext context) { } else { if (context.occurrences.length > 1) { - WindowManager.getInstance().getStatusBar(context.project) - .setInfo("Press escape to remove highlighting"); +// WindowManager.getInstance().getStatusBar(context.project) +// .setInfo("Press escape to remove highlighting"); } } return null; diff --git a/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceSettings.java b/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceSettings.java index dcc20c86..bda61b1a 100644 --- a/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceSettings.java +++ b/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceSettings.java @@ -15,7 +15,7 @@ */ package com.sylvanaar.idea.lua.refactoring.introduce; -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * @author Maxim.Medvedev diff --git a/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceVariableBase.java b/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceVariableBase.java index 31b14774..a0329111 100644 --- a/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceVariableBase.java +++ b/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceVariableBase.java @@ -16,10 +16,6 @@ package com.sylvanaar.idea.lua.refactoring.introduce; -import consulo.language.psi.util.PsiTreeUtil; -import consulo.logging.Logger; -import consulo.language.psi.PsiElement; -import consulo.language.util.IncorrectOperationException; import com.sylvanaar.idea.lua.lang.psi.LuaPsiElementFactory; import com.sylvanaar.idea.lua.lang.psi.LuaPsiFileBase; import com.sylvanaar.idea.lua.lang.psi.LuaReferenceElement; @@ -34,12 +30,15 @@ import com.sylvanaar.idea.lua.lang.psi.symbols.LuaSymbol; import com.sylvanaar.idea.lua.lang.psi.util.LuaStatementOwner; import com.sylvanaar.idea.lua.refactoring.LuaRefactoringUtil; -import javax.annotation.Nonnull; +import consulo.language.psi.PsiElement; +import consulo.language.psi.util.PsiTreeUtil; +import consulo.language.util.IncorrectOperationException; +import consulo.logging.Logger; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; import java.util.ArrayList; -import javax.annotation.Nullable; - /** * @author ilyas */ diff --git a/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceVariableDialog.java b/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceVariableDialog.java index 8b2dfbf0..4638f187 100644 --- a/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceVariableDialog.java +++ b/src/main/java/com/sylvanaar/idea/lua/refactoring/introduce/LuaIntroduceVariableDialog.java @@ -16,9 +16,9 @@ package com.sylvanaar.idea.lua.refactoring.introduce; -import com.sylvanaar.idea.lua.*; -import com.sylvanaar.idea.lua.lang.psi.expressions.*; -import com.sylvanaar.idea.lua.refactoring.*; +import com.sylvanaar.idea.lua.LuaFileType; +import com.sylvanaar.idea.lua.lang.psi.expressions.LuaExpression; +import com.sylvanaar.idea.lua.refactoring.LuaRefactoringUtil; import consulo.document.event.DocumentEvent; import consulo.document.event.DocumentListener; import consulo.language.editor.ui.awt.EditorComboBoxEditor; @@ -28,12 +28,12 @@ import consulo.project.Project; import consulo.ui.ex.awt.ComboBox; import consulo.ui.ex.awt.DialogWrapper; +import jakarta.annotation.Nullable; -import javax.annotation.Nullable; import javax.swing.*; -import javax.swing.event.*; +import javax.swing.event.EventListenerList; import java.awt.event.*; -import java.util.*; +import java.util.EventListener; public class LuaIntroduceVariableDialog extends DialogWrapper implements LuaIntroduceDialog { diff --git a/src/main/java/com/sylvanaar/idea/lua/run/LuaConfigurationType.java b/src/main/java/com/sylvanaar/idea/lua/run/LuaConfigurationType.java index 26261b92..ca460239 100644 --- a/src/main/java/com/sylvanaar/idea/lua/run/LuaConfigurationType.java +++ b/src/main/java/com/sylvanaar/idea/lua/run/LuaConfigurationType.java @@ -17,14 +17,15 @@ import com.sylvanaar.idea.lua.LuaIcons; import consulo.annotation.component.ExtensionImpl; +import consulo.application.Application; import consulo.execution.configuration.ConfigurationFactory; import consulo.execution.configuration.ConfigurationType; import consulo.execution.configuration.RunConfiguration; import consulo.execution.configuration.RunConfigurationModule; +import consulo.localize.LocalizeValue; import consulo.project.Project; import consulo.ui.image.Image; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; @ExtensionImpl public class LuaConfigurationType implements ConfigurationType @@ -39,12 +40,12 @@ public RunConfiguration createTemplateConfiguration(Project project) { } }; } - public String getDisplayName() { - return "Lua Script"; + public LocalizeValue getDisplayName() { + return LocalizeValue.localizeTODO("Lua Script"); } - public String getConfigurationTypeDescription() { - return "Lua run configuration"; + public LocalizeValue getConfigurationTypeDescription() { + return LocalizeValue.localizeTODO("Lua run configuration"); } public Image getIcon() { @@ -57,7 +58,7 @@ public String getId() { } public static LuaConfigurationType getInstance() { - return EP_NAME.findExtensionOrFail(LuaConfigurationType.class); + return Application.get().getExtensionPoint(ConfigurationType.class).findExtensionOrFail(LuaConfigurationType.class); } public ConfigurationFactory[] getConfigurationFactories() { diff --git a/src/main/java/com/sylvanaar/idea/lua/run/LuaLineErrorFilterProvider.java b/src/main/java/com/sylvanaar/idea/lua/run/LuaLineErrorFilterProvider.java index 4e96dedd..bbccf9b8 100644 --- a/src/main/java/com/sylvanaar/idea/lua/run/LuaLineErrorFilterProvider.java +++ b/src/main/java/com/sylvanaar/idea/lua/run/LuaLineErrorFilterProvider.java @@ -20,8 +20,7 @@ import consulo.execution.ui.console.ConsoleFilterProvider; import consulo.execution.ui.console.Filter; import consulo.project.Project; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/run/LuaRunConfiguration.java b/src/main/java/com/sylvanaar/idea/lua/run/LuaRunConfiguration.java index 70b412d1..c1967540 100644 --- a/src/main/java/com/sylvanaar/idea/lua/run/LuaRunConfiguration.java +++ b/src/main/java/com/sylvanaar/idea/lua/run/LuaRunConfiguration.java @@ -39,9 +39,9 @@ import consulo.util.xml.serializer.WriteExternalException; import consulo.virtualFileSystem.LocalFileSystem; import consulo.virtualFileSystem.VirtualFile; +import jakarta.annotation.Nonnull; import org.jdom.Element; -import javax.annotation.Nonnull; import java.io.File; import java.util.Arrays; import java.util.Collection; diff --git a/src/main/java/com/sylvanaar/idea/lua/run/LuaRunConfigurationEditor.java b/src/main/java/com/sylvanaar/idea/lua/run/LuaRunConfigurationEditor.java index 4bde7bf6..78a592c5 100644 --- a/src/main/java/com/sylvanaar/idea/lua/run/LuaRunConfigurationEditor.java +++ b/src/main/java/com/sylvanaar/idea/lua/run/LuaRunConfigurationEditor.java @@ -18,8 +18,7 @@ import consulo.configurable.ConfigurationException; import consulo.execution.configuration.ui.SettingsEditor; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import javax.swing.*; diff --git a/src/main/java/com/sylvanaar/idea/lua/run/LuaRunConfigurationProducer.java b/src/main/java/com/sylvanaar/idea/lua/run/LuaRunConfigurationProducer.java index cbb258df..436109f5 100644 --- a/src/main/java/com/sylvanaar/idea/lua/run/LuaRunConfigurationProducer.java +++ b/src/main/java/com/sylvanaar/idea/lua/run/LuaRunConfigurationProducer.java @@ -84,7 +84,7 @@ protected RunnerAndConfigurationSettings createConfigurationByElement(Location l } @Override - public int compareTo(Object o) { + public int compareTo(RuntimeConfigurationProducer o) { return 0; } } \ No newline at end of file diff --git a/src/main/java/com/sylvanaar/idea/lua/run/LuaRunner.java b/src/main/java/com/sylvanaar/idea/lua/run/LuaRunner.java index 3b863617..087601f2 100644 --- a/src/main/java/com/sylvanaar/idea/lua/run/LuaRunner.java +++ b/src/main/java/com/sylvanaar/idea/lua/run/LuaRunner.java @@ -27,8 +27,7 @@ import consulo.execution.runner.RunContentBuilder; import consulo.execution.ui.RunContentDescriptor; import consulo.process.ExecutionException; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/run/kahlua/KahluaCommandLineState.java b/src/main/java/com/sylvanaar/idea/lua/run/kahlua/KahluaCommandLineState.java index 032d9390..dd753930 100644 --- a/src/main/java/com/sylvanaar/idea/lua/run/kahlua/KahluaCommandLineState.java +++ b/src/main/java/com/sylvanaar/idea/lua/run/kahlua/KahluaCommandLineState.java @@ -35,8 +35,7 @@ import consulo.ui.ex.toolWindow.ToolWindow; import consulo.virtualFileSystem.LocalFileSystem; import consulo.virtualFileSystem.VirtualFile; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * Created by IntelliJ IDEA. @@ -44,8 +43,6 @@ * Date: Aug 28, 2010 * Time: 6:35:19 PM */ - - public class KahluaCommandLineState extends LuaCommandLineState { private static final Logger log = Logger.getInstance("Lua.KahluaCommandLineState"); diff --git a/src/main/java/com/sylvanaar/idea/lua/run/kahlua/KahluaProcessHandler.java b/src/main/java/com/sylvanaar/idea/lua/run/kahlua/KahluaProcessHandler.java index 121bbff2..168093a9 100644 --- a/src/main/java/com/sylvanaar/idea/lua/run/kahlua/KahluaProcessHandler.java +++ b/src/main/java/com/sylvanaar/idea/lua/run/kahlua/KahluaProcessHandler.java @@ -16,8 +16,8 @@ package com.sylvanaar.idea.lua.run.kahlua; -import consulo.process.ProcessHandler; import consulo.logging.Logger; +import consulo.process.BaseProcessHandler; import java.io.OutputStream; @@ -27,7 +27,7 @@ * Date: Sep 19, 2010 * Time: 3:06:41 PM */ -public class KahluaProcessHandler extends ProcessHandler { +public class KahluaProcessHandler extends BaseProcessHandler { private static final Logger log = Logger.getInstance("Lua.KahluaProcessHandler"); public KahluaProcessHandler() { } diff --git a/src/main/java/com/sylvanaar/idea/lua/run/lua/LuaCommandLineState.java b/src/main/java/com/sylvanaar/idea/lua/run/lua/LuaCommandLineState.java index b2ed17bf..60a46117 100644 --- a/src/main/java/com/sylvanaar/idea/lua/run/lua/LuaCommandLineState.java +++ b/src/main/java/com/sylvanaar/idea/lua/run/lua/LuaCommandLineState.java @@ -28,8 +28,7 @@ import consulo.process.ProcessHandlerBuilder; import consulo.process.cmd.GeneralCommandLine; import consulo.util.lang.StringUtil; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; import static consulo.lua.bundle.BaseLuaSdkType.getTopLevelExecutable; diff --git a/src/main/java/com/sylvanaar/idea/lua/run/luaj/LuaJExternalCommandLineState.java b/src/main/java/com/sylvanaar/idea/lua/run/luaj/LuaJExternalCommandLineState.java index a049fb50..88ea9e82 100644 --- a/src/main/java/com/sylvanaar/idea/lua/run/luaj/LuaJExternalCommandLineState.java +++ b/src/main/java/com/sylvanaar/idea/lua/run/luaj/LuaJExternalCommandLineState.java @@ -23,8 +23,7 @@ import consulo.execution.runner.ExecutionEnvironment; import consulo.process.cmd.GeneralCommandLine; import consulo.virtualFileSystem.VirtualFile; - -import javax.annotation.Nullable; +import jakarta.annotation.Nullable; /** * Created by IntelliJ IDEA. diff --git a/src/main/java/com/sylvanaar/idea/lua/util/LuaAtomicNotNullLazyValue.java b/src/main/java/com/sylvanaar/idea/lua/util/LuaAtomicNotNullLazyValue.java index 9ccb70eb..887e8f7d 100644 --- a/src/main/java/com/sylvanaar/idea/lua/util/LuaAtomicNotNullLazyValue.java +++ b/src/main/java/com/sylvanaar/idea/lua/util/LuaAtomicNotNullLazyValue.java @@ -16,7 +16,8 @@ package com.sylvanaar.idea.lua.util; -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; + import java.util.function.Supplier; @Deprecated diff --git a/src/main/java/com/sylvanaar/idea/lua/util/LuaFileUtil.java b/src/main/java/com/sylvanaar/idea/lua/util/LuaFileUtil.java index 301c25cf..0acb182c 100644 --- a/src/main/java/com/sylvanaar/idea/lua/util/LuaFileUtil.java +++ b/src/main/java/com/sylvanaar/idea/lua/util/LuaFileUtil.java @@ -23,11 +23,10 @@ import consulo.virtualFileSystem.LocalFileSystem; import consulo.virtualFileSystem.VirtualFile; import consulo.virtualFileSystem.VirtualFileFilter; -import consulo.virtualFileSystem.internal.matcher.ExtensionFileNameMatcher; +import consulo.virtualFileSystem.fileType.FileNameMatcher; import consulo.virtualFileSystem.util.VirtualFileUtil; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * @author Maxim.Manuylov @@ -63,8 +62,8 @@ public boolean accept(VirtualFile file) { return true; } - for (ExtensionFileNameMatcher matcher : LuaFileType.EXTENSION_FILE_NAME_MATCHERS) { - if (matcher.accept(file.getName())) { + for (FileNameMatcher matcher : LuaFileType.EXTENSION_FILE_NAME_MATCHERS) { + if (matcher.acceptsCharSequence(file.getName())) { return true; } } diff --git a/src/main/java/com/sylvanaar/idea/lua/util/LuaSystemUtil.java b/src/main/java/com/sylvanaar/idea/lua/util/LuaSystemUtil.java index 01d177c7..8353d6c4 100644 --- a/src/main/java/com/sylvanaar/idea/lua/util/LuaSystemUtil.java +++ b/src/main/java/com/sylvanaar/idea/lua/util/LuaSystemUtil.java @@ -25,8 +25,8 @@ import consulo.execution.ui.console.TextConsoleBuilderFactory; import consulo.process.ExecutionException; import consulo.process.cmd.GeneralCommandLine; -import consulo.process.local.ExecUtil; -import consulo.process.local.ProcessOutput; +import consulo.process.util.CapturingProcessUtil; +import consulo.process.util.ProcessOutput; import consulo.project.Project; import consulo.project.ui.wm.ToolWindowManager; import consulo.ui.ex.content.Content; @@ -38,8 +38,8 @@ import consulo.util.io.FileUtil; import consulo.util.lang.StringUtil; import consulo.virtualFileSystem.VirtualFile; +import jakarta.annotation.Nonnull; -import javax.annotation.Nonnull; import java.io.File; import java.util.*; @@ -81,7 +81,7 @@ public static ProcessOutput execute(@Nonnull final GeneralCommandLine cmd) throw @Nonnull public static ProcessOutput execute(@Nonnull final GeneralCommandLine cmd, final int timeout) throws ExecutionException { - return ExecUtil.execAndGetOutput(cmd, timeout); + return CapturingProcessUtil.execAndGetOutput(cmd, timeout); } public static void addStdPaths(@Nonnull final GeneralCommandLine cmd, @Nonnull final Sdk sdk) { diff --git a/src/main/java/com/sylvanaar/idea/lua/util/UrlUtil.java b/src/main/java/com/sylvanaar/idea/lua/util/UrlUtil.java index e16f8977..7be21055 100644 --- a/src/main/java/com/sylvanaar/idea/lua/util/UrlUtil.java +++ b/src/main/java/com/sylvanaar/idea/lua/util/UrlUtil.java @@ -23,9 +23,9 @@ import consulo.virtualFileSystem.VirtualFile; import consulo.virtualFileSystem.VirtualFileManager; import consulo.virtualFileSystem.util.VirtualFileUtil; +import jakarta.annotation.Nullable; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nullable; import java.io.*; import java.net.URL; import java.net.URLConnection; diff --git a/src/main/java/consulo/lua/action/NewLuaFileAction.java b/src/main/java/consulo/lua/action/NewLuaFileAction.java index 3db72276..f7655607 100644 --- a/src/main/java/consulo/lua/action/NewLuaFileAction.java +++ b/src/main/java/consulo/lua/action/NewLuaFileAction.java @@ -1,11 +1,12 @@ package consulo.lua.action; -import consulo.project.Project; -import consulo.language.psi.PsiDirectory; import com.sylvanaar.idea.lua.LuaBundle; import com.sylvanaar.idea.lua.LuaIcons; import consulo.ide.action.CreateFileFromTemplateAction; import consulo.ide.action.CreateFileFromTemplateDialog; +import consulo.language.psi.PsiDirectory; +import consulo.localize.LocalizeValue; +import consulo.project.Project; /** * @author VISTALL @@ -21,12 +22,12 @@ public NewLuaFileAction() @Override protected void buildDialog(Project project, PsiDirectory psiDirectory, CreateFileFromTemplateDialog.Builder builder) { - builder.addKind("File", LuaIcons.LUA_ICON, "Lua Script.lua"); + builder.addKind(LocalizeValue.localizeTODO("File"), LuaIcons.LUA_ICON, "Lua Script.lua"); } @Override - protected String getActionName(PsiDirectory directory, String newName, String templateName) + protected LocalizeValue getActionName(PsiDirectory directory, String newName, String templateName) { - return LuaBundle.message("newfile.menu.action.text"); + return LocalizeValue.localizeTODO(LuaBundle.message("newfile.menu.action.text")); } } diff --git a/src/main/java/consulo/lua/bundle/BaseLuaSdkType.java b/src/main/java/consulo/lua/bundle/BaseLuaSdkType.java index 9c56ddc7..3e10d0be 100644 --- a/src/main/java/consulo/lua/bundle/BaseLuaSdkType.java +++ b/src/main/java/consulo/lua/bundle/BaseLuaSdkType.java @@ -21,13 +21,15 @@ import com.sylvanaar.idea.lua.run.lua.LuaCommandLineState; import com.sylvanaar.idea.lua.util.LuaSystemUtil; import consulo.annotation.component.ExtensionImpl; +import consulo.application.Application; import consulo.application.util.SystemInfo; +import consulo.content.bundle.SdkType; import consulo.execution.runner.ExecutionEnvironment; import consulo.process.ExecutionException; -import consulo.process.local.ProcessOutput; +import consulo.process.util.ProcessOutput; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; -import javax.annotation.Nonnull; -import javax.annotation.Nullable; import java.io.File; import java.util.ArrayList; import java.util.Collection; @@ -41,7 +43,7 @@ public class BaseLuaSdkType extends LuaSdkType { @Nonnull public static BaseLuaSdkType getInstance() { - return EP_NAME.findExtensionOrFail(BaseLuaSdkType.class); + return Application.get().getExtensionPoint(SdkType.class).findExtensionOrFail(BaseLuaSdkType.class); } public BaseLuaSdkType() { diff --git a/src/main/java/consulo/lua/bundle/KahluaSdkType.java b/src/main/java/consulo/lua/bundle/KahluaSdkType.java index 77f6dd78..780579a3 100644 --- a/src/main/java/consulo/lua/bundle/KahluaSdkType.java +++ b/src/main/java/consulo/lua/bundle/KahluaSdkType.java @@ -20,11 +20,12 @@ import com.sylvanaar.idea.lua.run.kahlua.KahluaCommandLineState; import com.sylvanaar.idea.lua.run.lua.LuaCommandLineState; import consulo.annotation.component.ExtensionImpl; +import consulo.application.Application; +import consulo.content.bundle.SdkType; import consulo.execution.runner.ExecutionEnvironment; import consulo.process.ExecutionException; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * @author VISTALL @@ -36,7 +37,7 @@ public class KahluaSdkType extends LuaSdkType @Nonnull public static KahluaSdkType getInstance() { - return EP_NAME.findExtension(KahluaSdkType.class); + return Application.get().getExtensionPoint(SdkType.class).findExtensionOrFail(KahluaSdkType.class); } public KahluaSdkType() diff --git a/src/main/java/consulo/lua/bundle/LuaJSdkType.java b/src/main/java/consulo/lua/bundle/LuaJSdkType.java index 6cd872cd..75078057 100644 --- a/src/main/java/consulo/lua/bundle/LuaJSdkType.java +++ b/src/main/java/consulo/lua/bundle/LuaJSdkType.java @@ -20,11 +20,12 @@ import com.sylvanaar.idea.lua.run.lua.LuaCommandLineState; import com.sylvanaar.idea.lua.run.luaj.LuaJExternalCommandLineState; import consulo.annotation.component.ExtensionImpl; +import consulo.application.Application; +import consulo.content.bundle.SdkType; import consulo.execution.runner.ExecutionEnvironment; import consulo.process.ExecutionException; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * @author VISTALL @@ -36,7 +37,7 @@ public class LuaJSdkType extends LuaSdkType @Nonnull public static LuaJSdkType getInstance() { - return EP_NAME.findExtension(LuaJSdkType.class); + return Application.get().getExtensionPoint(SdkType.class).findExtensionOrFail(LuaJSdkType.class); } public LuaJSdkType() diff --git a/src/main/java/consulo/lua/bundle/LuaPredefinedBundlesProvider.java b/src/main/java/consulo/lua/bundle/LuaPredefinedBundlesProvider.java index 6e836c72..2fd03b2d 100644 --- a/src/main/java/consulo/lua/bundle/LuaPredefinedBundlesProvider.java +++ b/src/main/java/consulo/lua/bundle/LuaPredefinedBundlesProvider.java @@ -20,8 +20,8 @@ import consulo.content.bundle.PredefinedBundlesProvider; import consulo.content.bundle.Sdk; import consulo.content.bundle.SdkModificator; +import jakarta.annotation.Nonnull; -import javax.annotation.Nonnull; import java.util.HashMap; import java.util.Map; diff --git a/src/main/java/consulo/lua/bundle/LuaSdkType.java b/src/main/java/consulo/lua/bundle/LuaSdkType.java index 7b1c7107..c207657e 100644 --- a/src/main/java/consulo/lua/bundle/LuaSdkType.java +++ b/src/main/java/consulo/lua/bundle/LuaSdkType.java @@ -30,9 +30,9 @@ import consulo.ui.image.Image; import consulo.virtualFileSystem.LocalFileSystem; import consulo.virtualFileSystem.VirtualFile; +import jakarta.annotation.Nonnull; import org.jetbrains.annotations.NonNls; -import javax.annotation.Nonnull; import java.io.File; /** diff --git a/src/main/java/consulo/lua/debugger/breakpoint/LuaLineBreakpointProperties.java b/src/main/java/consulo/lua/debugger/breakpoint/LuaLineBreakpointProperties.java index 759bd018..0d483f3c 100644 --- a/src/main/java/consulo/lua/debugger/breakpoint/LuaLineBreakpointProperties.java +++ b/src/main/java/consulo/lua/debugger/breakpoint/LuaLineBreakpointProperties.java @@ -16,9 +16,9 @@ package consulo.lua.debugger.breakpoint; -import javax.annotation.Nullable; -import consulo.util.xml.serializer.XmlSerializerUtil; import consulo.execution.debug.breakpoint.XBreakpointProperties; +import consulo.util.xml.serializer.XmlSerializerUtil; +import jakarta.annotation.Nullable; /** * @author VISTALL diff --git a/src/main/java/consulo/lua/debugger/breakpoint/LuaLineBreakpointTypeResolver.java b/src/main/java/consulo/lua/debugger/breakpoint/LuaLineBreakpointTypeResolver.java index c3623d14..45322a5c 100644 --- a/src/main/java/consulo/lua/debugger/breakpoint/LuaLineBreakpointTypeResolver.java +++ b/src/main/java/consulo/lua/debugger/breakpoint/LuaLineBreakpointTypeResolver.java @@ -31,9 +31,8 @@ import consulo.project.Project; import consulo.virtualFileSystem.VirtualFile; import consulo.virtualFileSystem.fileType.FileType; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * @author VISTALL diff --git a/src/main/java/consulo/lua/module/extension/LuaModuleExtension.java b/src/main/java/consulo/lua/module/extension/LuaModuleExtension.java index e1917086..0eb838e7 100644 --- a/src/main/java/consulo/lua/module/extension/LuaModuleExtension.java +++ b/src/main/java/consulo/lua/module/extension/LuaModuleExtension.java @@ -20,8 +20,7 @@ import consulo.lua.bundle.LuaSdkType; import consulo.module.content.layer.ModuleRootLayer; import consulo.module.content.layer.extension.ModuleExtensionWithSdkBase; - -import javax.annotation.Nonnull; +import jakarta.annotation.Nonnull; /** * @author VISTALL diff --git a/src/main/java/consulo/lua/module/extension/LuaMutableModuleExtension.java b/src/main/java/consulo/lua/module/extension/LuaMutableModuleExtension.java index c087ebf8..47cdf9ab 100644 --- a/src/main/java/consulo/lua/module/extension/LuaMutableModuleExtension.java +++ b/src/main/java/consulo/lua/module/extension/LuaMutableModuleExtension.java @@ -25,9 +25,8 @@ import consulo.ui.Component; import consulo.ui.annotation.RequiredUIAccess; import consulo.ui.layout.VerticalLayout; - -import javax.annotation.Nonnull; -import javax.annotation.Nullable; +import jakarta.annotation.Nonnull; +import jakarta.annotation.Nullable; /** * @author VISTALL diff --git a/src/main/java/module-info.java b/src/main/java/module-info.java index febf7d3c..58cf2b9e 100644 --- a/src/main/java/module-info.java +++ b/src/main/java/module-info.java @@ -1,7 +1,20 @@ /** * @author VISTALL - * @since 03/06/2023 + * @since 2023-06-03 */ module consulo.lua { - + requires transitive consulo.annotation; + requires transitive consulo.application.api; + requires transitive consulo.execution.debug.api; + requires transitive consulo.http.api; + requires transitive consulo.ide.api; + requires transitive consulo.language.api; + requires transitive consulo.language.editor.refactoring.api; + requires transitive consulo.process.api; + requires transitive consulo.virtual.file.system.api; + + requires core; + requires interpreter; + requires jakarta.annotation; + requires jsyntaxpane; } \ No newline at end of file diff --git a/src/test/java_/com/sylvanaar/idea/Lua/LightLuaTestCase.java b/src/test/java_/com/sylvanaar/idea/Lua/LightLuaTestCase.java index 38cb8276..8974ea7a 100644 --- a/src/test/java_/com/sylvanaar/idea/Lua/LightLuaTestCase.java +++ b/src/test/java_/com/sylvanaar/idea/Lua/LightLuaTestCase.java @@ -16,11 +16,11 @@ package com.sylvanaar.idea.lua; -import org.jetbrains.annotations.NonNls; -import javax.annotation.Nonnull; import com.intellij.testFramework.TestModuleDescriptor; import com.intellij.testFramework.fixtures.LightPlatformCodeInsightFixtureTestCase; import com.sylvanaar.idea.lua.util.TestUtils; +import jakarta.annotation.Nonnull; +import org.jetbrains.annotations.NonNls; /** * @author peter diff --git a/src/test/java_/com/sylvanaar/idea/Lua/LuaLightProjectDescriptor.java b/src/test/java_/com/sylvanaar/idea/Lua/LuaLightProjectDescriptor.java index ea5030a7..fecc8685 100644 --- a/src/test/java_/com/sylvanaar/idea/Lua/LuaLightProjectDescriptor.java +++ b/src/test/java_/com/sylvanaar/idea/Lua/LuaLightProjectDescriptor.java @@ -16,13 +16,12 @@ package com.sylvanaar.idea.lua; -import javax.annotation.Nonnull; - +import com.intellij.testFramework.TestModuleDescriptor; import consulo.content.bundle.Sdk; import consulo.module.Module; -import consulo.module.content.layer.ModifiableRootModel; -import com.intellij.testFramework.TestModuleDescriptor; import consulo.module.content.layer.ContentEntry; +import consulo.module.content.layer.ModifiableRootModel; +import jakarta.annotation.Nonnull; import java.util.function.Consumer;