From abf1ddf0d1191c6885e7f3a3ea144490372a77f3 Mon Sep 17 00:00:00 2001 From: Piotr Sokolowski Date: Mon, 12 Oct 2020 10:02:17 +0200 Subject: [PATCH 01/15] #921 Adds content to modules section of .app file --- build.gradle | 2 + jps-plugin/build.gradle | 10 ++- .../erlang/jps/builder/AppFileConverter.java | 72 +++++++++++++++++++ .../erlang/jps/builder/ErlangBuilder.java | 2 +- resources/META-INF/java-deps.xml | 2 +- 5 files changed, 85 insertions(+), 3 deletions(-) create mode 100755 jps-plugin/src/org/intellij/erlang/jps/builder/AppFileConverter.java diff --git a/build.gradle b/build.gradle index ee10abeee..af3fe5977 100644 --- a/build.gradle +++ b/build.gradle @@ -53,6 +53,7 @@ allprojects { } repositories { + mavenCentral() flatDir { dirs 'libs' } @@ -61,6 +62,7 @@ repositories { dependencies { compile name: 'OtpErlang' compile project('jps-plugin') + compile group: 'com.github.metadave', name: 'etp', version: '0.4' } apply plugin: 'idea' diff --git a/jps-plugin/build.gradle b/jps-plugin/build.gradle index 4d2afe4e5..75c21ea9e 100644 --- a/jps-plugin/build.gradle +++ b/jps-plugin/build.gradle @@ -1 +1,9 @@ -jar.archiveName = "jps-plugin.jar" \ No newline at end of file +jar.archiveName = "jps-plugin.jar" + +repositories { + mavenCentral() +} + +dependencies { + compile group: 'com.github.metadave', name: 'etp', version: '0.4' +} \ No newline at end of file diff --git a/jps-plugin/src/org/intellij/erlang/jps/builder/AppFileConverter.java b/jps-plugin/src/org/intellij/erlang/jps/builder/AppFileConverter.java new file mode 100755 index 000000000..f782c3a85 --- /dev/null +++ b/jps-plugin/src/org/intellij/erlang/jps/builder/AppFileConverter.java @@ -0,0 +1,72 @@ +package org.intellij.erlang.jps.builder; + +import java.io.*; +import java.text.ParseException; +import java.util.ArrayList; +import java.util.HashSet; +import java.util.List; + +import com.intellij.openapi.util.io.FileUtil; +import com.metadave.etp.ETP; +import com.metadave.etp.rep.*; +import org.jetbrains.jps.incremental.CompileContext; +import org.jetbrains.jps.incremental.messages.BuildMessage; +import org.jetbrains.jps.incremental.messages.CompilerMessage; + +/** + * Takes original xxx.app.src file decodes it using ETP library, and adds modules and registred sections + * if they are not already present. + */ +public class AppFileConverter { + private File appConfigSrc; + private ETPTuple appConfigterms; + private CompileContext context; + public AppFileConverter(CompileContext context, File appConfigSrc, File outputDir) { + this.context=context; + this.appConfigSrc=appConfigSrc; + try { + appConfigterms = (ETPTuple)ETP.parse(new FileInputStream(appConfigSrc)); + if(!"application".equals(((ETPAtom)(appConfigterms.getValue(0))).getValue())) + throw new ParseException("Unexpected file format - missing application",0); + List> list=((ETPList)(appConfigterms.getValue(2))).getValue(); + HashSet s = new HashSet<>(); + for(ETPTerm etpTerm : list) { + String name = ((ETPAtom)(((ETPTuple)etpTerm).getValue(0))).getValue(); + s.add(name); + } + if(!s.contains("registered")) { + list.add(new ETPTuple(new ETPAtom("registered"),new ETPList(new ArrayList>()))); + } + if(!s.contains("modules")) { + String[] names = outputDir.list(new FilenameFilter() { + @Override + public boolean accept(File dir, String name) { + return name.endsWith("beam"); + } + }); + ArrayList> modules = new ArrayList>(); + for(int i=0;i - + From 2b9f1d94247a73376ed9a153b7fd83c207255c36 Mon Sep 17 00:00:00 2001 From: Piotr Sokolowski Date: Mon, 12 Oct 2020 11:48:59 +0200 Subject: [PATCH 02/15] #921 Missed dot at the end. --- .../src/org/intellij/erlang/jps/builder/AppFileConverter.java | 1 + 1 file changed, 1 insertion(+) diff --git a/jps-plugin/src/org/intellij/erlang/jps/builder/AppFileConverter.java b/jps-plugin/src/org/intellij/erlang/jps/builder/AppFileConverter.java index f782c3a85..581c6ed12 100755 --- a/jps-plugin/src/org/intellij/erlang/jps/builder/AppFileConverter.java +++ b/jps-plugin/src/org/intellij/erlang/jps/builder/AppFileConverter.java @@ -61,6 +61,7 @@ public void writeToFile(File appConfigDst) throws IOException { if(appConfigterms!=null) try(FileWriter fw=new FileWriter(appConfigDst)) { fw.write(appConfigterms.toString()); + fw.write("."); } catch(Exception e) { context.processMessage(new CompilerMessage(ErlangBuilder.NAME, BuildMessage.Kind.INFO, "Failed to write "+appConfigDst+" : "+e.getLocalizedMessage())); appConfigterms=null; From d5d5a6b9ccebcb7364606030b44a3710dc03fbf6 Mon Sep 17 00:00:00 2001 From: Piotr Sokolowski Date: Tue, 13 Oct 2020 10:06:46 +0200 Subject: [PATCH 03/15] #923 URL<->Path conversions are done without invoking VirtualFileManager --- .../intellij/erlang/jps/builder/ErlangCompilerError.java | 4 +++- .../erlang/jps/builder/ErlangCompilerProcessAdapter.java | 9 +++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/jps-plugin/src/org/intellij/erlang/jps/builder/ErlangCompilerError.java b/jps-plugin/src/org/intellij/erlang/jps/builder/ErlangCompilerError.java index cb647cd08..29e185bf6 100644 --- a/jps-plugin/src/org/intellij/erlang/jps/builder/ErlangCompilerError.java +++ b/jps-plugin/src/org/intellij/erlang/jps/builder/ErlangCompilerError.java @@ -16,6 +16,7 @@ package org.intellij.erlang.jps.builder; +import com.intellij.openapi.vfs.VirtualFileManager; import org.jetbrains.jps.incremental.messages.BuildMessage; import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.text.StringUtil; @@ -90,6 +91,7 @@ private static ErlangCompilerError createCompilerError(@NotNull String filePath, @NotNull String details) { int lineNumber = StringUtil.parseInt(line, -1); BuildMessage.Kind category = warning != null ? BuildMessage.Kind.WARNING : BuildMessage.Kind.ERROR; - return new ErlangCompilerError(details, VfsUtilCore.pathToUrl(filePath), lineNumber, category); + String fileUrl= "file://"+ FileUtil.toSystemIndependentName(filePath); + return new ErlangCompilerError(details, fileUrl, lineNumber, category); } } diff --git a/jps-plugin/src/org/intellij/erlang/jps/builder/ErlangCompilerProcessAdapter.java b/jps-plugin/src/org/intellij/erlang/jps/builder/ErlangCompilerProcessAdapter.java index f839e7008..ce57d340d 100644 --- a/jps-plugin/src/org/intellij/erlang/jps/builder/ErlangCompilerProcessAdapter.java +++ b/jps-plugin/src/org/intellij/erlang/jps/builder/ErlangCompilerProcessAdapter.java @@ -18,7 +18,6 @@ import com.intellij.execution.process.ProcessEvent; import com.intellij.openapi.util.Key; -import com.intellij.openapi.vfs.VirtualFileManager; import org.jetbrains.annotations.NotNull; import org.jetbrains.jps.incremental.CompileContext; import org.jetbrains.jps.incremental.messages.BuildMessage; @@ -49,9 +48,15 @@ public static CompilerMessage createCompilerMessage(@NotNull String builderName, if (error != null) { kind = error.getKind(); messageText = error.getErrorMessage(); - sourcePath = VirtualFileManager.extractPath(error.getUrl()); + + sourcePath = extractPath(error.getUrl()); line = error.getLine(); } return new CompilerMessage(builderName, kind, messageText, sourcePath, -1L, -1L, -1L, line, -1L); } + + private static String extractPath(String url) { + int index = url.indexOf("://"); + return index >= 0 ? url.substring(index + "://".length()) : url; + } } From fa6a67f62858f91711661ba1cbd8185404895e64 Mon Sep 17 00:00:00 2001 From: Piotr Sokolowski Date: Tue, 13 Oct 2020 10:18:02 +0200 Subject: [PATCH 04/15] runIde not runIdea --- .idea/runConfigurations/Local_IDE.xml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/.idea/runConfigurations/Local_IDE.xml b/.idea/runConfigurations/Local_IDE.xml index de09ed9fa..1aadb6704 100644 --- a/.idea/runConfigurations/Local_IDE.xml +++ b/.idea/runConfigurations/Local_IDE.xml @@ -1,6 +1,6 @@ - + - + true + \ No newline at end of file From 21286ed91217d0eb4590ff2dae76c26197c0ee37 Mon Sep 17 00:00:00 2001 From: Piotr Sokolowski Date: Fri, 4 Mar 2022 08:54:22 +0100 Subject: [PATCH 05/15] added extra flags to erlang compiler --- .idea/ant.xml | 3 - .idea/codeStyleSettings.xml | 69 --- .idea/codeStyles/Project.xml | 58 --- .idea/codeStyles/codeStyleConfig.xml | 5 - .idea/compiler.xml | 14 +- .idea/copyright/apache.xml | 8 - .idea/copyright/profiles_settings.xml | 9 - .idea/dbnavigator.xml | 458 ++++++++++++++++++ .idea/dictionaries/ignatov.xml | 13 - .idea/encodings.xml | 6 - .idea/icon.png | Bin 927 -> 0 bytes .idea/inspectionProfiles/Project_Default.xml | 413 ---------------- .../inspectionProfiles/profiles_settings.xml | 7 - .idea/jarRepositories.xml | 30 ++ .idea/markdown.xml | 9 + .idea/misc.xml | 4 +- .idea/runConfigurations/Compilation_tests.xml | 20 - .idea/runConfigurations/Erlang.xml | 21 - .idea/runConfigurations/Erlang_Compiler.xml | 16 - .idea/runConfigurations/Local_IDE.xml | 22 - .idea/runConfigurations/Tests.xml | 20 - .idea/scopes/scope_settings.xml | 5 - .idea/uiDesigner.xml | 3 - .idea/vcs.xml | 5 +- .../erlang/jps/builder/AppFileConverter.java | 5 +- .../erlang/jps/builder/ErlangBuilder.java | 7 +- .../ErlangModuleExtensionProperties.java | 7 + .../jps/model/JpsErlangModuleExtension.java | 4 + .../facet/ErlangFacetConfiguration.java | 14 + .../erlang/facet/ui/ErlangFacetEditor.form | 18 +- .../erlang/facet/ui/ErlangFacetEditor.java | 41 ++ 31 files changed, 595 insertions(+), 719 deletions(-) delete mode 100644 .idea/ant.xml delete mode 100644 .idea/codeStyleSettings.xml delete mode 100644 .idea/codeStyles/Project.xml delete mode 100644 .idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/copyright/apache.xml delete mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/dbnavigator.xml delete mode 100644 .idea/dictionaries/ignatov.xml delete mode 100644 .idea/encodings.xml delete mode 100755 .idea/icon.png delete mode 100644 .idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/jarRepositories.xml create mode 100644 .idea/markdown.xml delete mode 100644 .idea/runConfigurations/Compilation_tests.xml delete mode 100644 .idea/runConfigurations/Erlang.xml delete mode 100644 .idea/runConfigurations/Erlang_Compiler.xml delete mode 100644 .idea/runConfigurations/Local_IDE.xml delete mode 100644 .idea/runConfigurations/Tests.xml delete mode 100644 .idea/scopes/scope_settings.xml diff --git a/.idea/ant.xml b/.idea/ant.xml deleted file mode 100644 index f6e673adc..000000000 --- a/.idea/ant.xml +++ /dev/null @@ -1,3 +0,0 @@ - - - diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml deleted file mode 100644 index d958a3143..000000000 --- a/.idea/codeStyleSettings.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index c43f6782b..000000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,58 +0,0 @@ - - - - - \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index 79ee123c2..000000000 --- a/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 5009aed02..fb7f4a8a4 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,18 +1,6 @@ - - - - - - - - - - - - - + \ No newline at end of file diff --git a/.idea/copyright/apache.xml b/.idea/copyright/apache.xml deleted file mode 100644 index 227c922be..000000000 --- a/.idea/copyright/apache.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml deleted file mode 100644 index 3ce798882..000000000 --- a/.idea/copyright/profiles_settings.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml new file mode 100644 index 000000000..8b38e2086 --- /dev/null +++ b/.idea/dbnavigator.xml @@ -0,0 +1,458 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/dictionaries/ignatov.xml b/.idea/dictionaries/ignatov.xml deleted file mode 100644 index abfed45ac..000000000 --- a/.idea/dictionaries/ignatov.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - autoimported - dialyzer - ebin - erlang - eunit - introducer - rebar - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index f75895965..000000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/icon.png b/.idea/icon.png deleted file mode 100755 index 95fd49965b75446e0a5e2f687c6c295b03799cc3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 927 zcmV;Q17Q4#P)Fw*OY%liYDtYqD}PpAOo_Z$O4tjs6w7K?ETJU%o3NT2 z*Z1ju)#f@E!Dlx8MbM3hsg@;J3*{TcYjW1`JgNc7m;-$m6~OQVbS> z&3yd>xC~lAZ#I`uCAbEDIi2J%2VO_=H{jo;)Z zmFO5)nT~-b=5-T&0y~&8)#U5JTreG+(^=OJ*?do~#K2;(*D&~xAPg>nSkkpOU>~SA z9J8Dsh_Qi_f;790C#{#xfQN?TM%*^ETYyVJwc#WxOWo4Ex6N?uIc^!y&A=YPhP!QW zZ;xR7THS+e4A>x;Kt0HvH#ihc71lMdoaxh4%SfhFrMrZxtzfEXpmaKrfdv7sUkY^$ z%m}c7d>sQN0XFbWXA>6+2k!!ZGHl>yI`u#*EeuLmqF*@H*q|8rEF3E@C3JE#NCQW)a zH>4SSm=&AzoN^kOscWE>^{uJaxD_56ssPu)D3{0nI$qZ@ppNVl!ay!C7!#>Z+&wVa z;~v$`*l$wQpB9#WlRyVpp>b~x3-p5G>uz1C_ozbD%xC_NECm0`N;KD6B`2|$qHMdUhV7#a z1g_TkaWLOXbowm64g8bJE~?cR;>r0wjiBTFFe2O|N8C27BnzcdC#h#UCd9uL3}!sB znN9j=R&}a-ndQ`P2=Al;*u(!TF>K&JH}F@00RVd^khW&9T^;}c002ovPDHLkV1jcS Bt - - - \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml deleted file mode 100644 index 3b312839b..000000000 --- a/.idea/inspectionProfiles/profiles_settings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml new file mode 100644 index 000000000..21dec3a2b --- /dev/null +++ b/.idea/jarRepositories.xml @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/markdown.xml b/.idea/markdown.xml new file mode 100644 index 000000000..4e28a22ba --- /dev/null +++ b/.idea/markdown.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index f3acacc31..082978c3a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,7 +1,7 @@ - - + + \ No newline at end of file diff --git a/.idea/runConfigurations/Compilation_tests.xml b/.idea/runConfigurations/Compilation_tests.xml deleted file mode 100644 index 54916307a..000000000 --- a/.idea/runConfigurations/Compilation_tests.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Erlang.xml b/.idea/runConfigurations/Erlang.xml deleted file mode 100644 index 3ee7f2dee..000000000 --- a/.idea/runConfigurations/Erlang.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - true - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Erlang_Compiler.xml b/.idea/runConfigurations/Erlang_Compiler.xml deleted file mode 100644 index bf93f0a45..000000000 --- a/.idea/runConfigurations/Erlang_Compiler.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Local_IDE.xml b/.idea/runConfigurations/Local_IDE.xml deleted file mode 100644 index 1aadb6704..000000000 --- a/.idea/runConfigurations/Local_IDE.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - true - - - \ No newline at end of file diff --git a/.idea/runConfigurations/Tests.xml b/.idea/runConfigurations/Tests.xml deleted file mode 100644 index 1793e77f2..000000000 --- a/.idea/runConfigurations/Tests.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml deleted file mode 100644 index 922003b84..000000000 --- a/.idea/scopes/scope_settings.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml index 0637f91e3..e96534fb2 100644 --- a/.idea/uiDesigner.xml +++ b/.idea/uiDesigner.xml @@ -119,9 +119,6 @@ - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml index c80f2198b..35eb1ddfb 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,7 +1,6 @@ - + - - + \ No newline at end of file diff --git a/jps-plugin/src/org/intellij/erlang/jps/builder/AppFileConverter.java b/jps-plugin/src/org/intellij/erlang/jps/builder/AppFileConverter.java index 581c6ed12..8360f4f91 100755 --- a/jps-plugin/src/org/intellij/erlang/jps/builder/AppFileConverter.java +++ b/jps-plugin/src/org/intellij/erlang/jps/builder/AppFileConverter.java @@ -52,7 +52,10 @@ public boolean accept(File dir, String name) { } } catch (Exception e) { - context.processMessage(new CompilerMessage(ErlangBuilder.NAME, BuildMessage.Kind.INFO, "Failed to parse "+appConfigSrc+" app src file : "+e.getLocalizedMessage())); + StringWriter sw = new StringWriter(); + PrintWriter pw = new PrintWriter(sw); + e.printStackTrace(pw); + context.processMessage(new CompilerMessage(ErlangBuilder.NAME, BuildMessage.Kind.INFO, "Failed to parse "+appConfigSrc+" app src file : "+e.getLocalizedMessage()+","+sw.toString())); appConfigterms = null; } } diff --git a/jps-plugin/src/org/intellij/erlang/jps/builder/ErlangBuilder.java b/jps-plugin/src/org/intellij/erlang/jps/builder/ErlangBuilder.java index 1559f9419..24dbb8975 100644 --- a/jps-plugin/src/org/intellij/erlang/jps/builder/ErlangBuilder.java +++ b/jps-plugin/src/org/intellij/erlang/jps/builder/ErlangBuilder.java @@ -153,8 +153,9 @@ protected File getDirtyElement(@NotNull File file) { for (File appConfigSrc : appConfigFiles) { for (File outputDir : outputDirectories) { File appConfigDst = getDestinationAppConfig(outputDir, appConfigSrc.getName()); + LOG.warn("Using AppFileConverter to generate app file"); new AppFileConverter(context, appConfigSrc, outputDir).writeToFile(appConfigDst); - reportMessage(context, String.format("Copy %s to %s", ErlangBuilderUtil.getPath(appConfigSrc), ErlangBuilderUtil.getPath(outputDir))); + reportMessage(context, String.format("Copy AppFileConverter %s to %s", ErlangBuilderUtil.getPath(appConfigSrc), ErlangBuilderUtil.getPath(outputDir))); outputConsumer.registerOutputFile(appConfigDst, Collections.singletonList(ErlangBuilderUtil.getPath(appConfigSrc))); } } @@ -283,10 +284,14 @@ private static void addParseTransforms(@NotNull GeneralCommandLine commandLine, @Nullable JpsModule module) { JpsErlangModuleExtension extension = JpsErlangModuleExtension.getExtension(module); List parseTransforms = extension != null ? extension.getParseTransforms() : Collections.emptyList(); + List flags = extension != null ? extension.getExtraFlags() : Collections.emptyList(); if (parseTransforms.isEmpty()) return; for (String ptModule : parseTransforms) { commandLine.addParameter("+{parse_transform, " + ptModule + "}"); } + for (String ptModule : flags) { + commandLine.addParameter(ptModule); + } } private static void addCodePath(@NotNull GeneralCommandLine commandLine, diff --git a/jps-plugin/src/org/intellij/erlang/jps/model/ErlangModuleExtensionProperties.java b/jps-plugin/src/org/intellij/erlang/jps/model/ErlangModuleExtensionProperties.java index 1dd0b67c3..7e3b70369 100644 --- a/jps-plugin/src/org/intellij/erlang/jps/model/ErlangModuleExtensionProperties.java +++ b/jps-plugin/src/org/intellij/erlang/jps/model/ErlangModuleExtensionProperties.java @@ -29,10 +29,17 @@ public class ErlangModuleExtensionProperties { //should not contain duplicate elements public List myParseTransforms = new ArrayList<>(); + @Tag("extraFlags") + @XCollection(elementName="flags") + //should not contain duplicate elements + public List myExtraFlags = new ArrayList<>(); + public ErlangModuleExtensionProperties() { } public ErlangModuleExtensionProperties(@NotNull ErlangModuleExtensionProperties props) { myParseTransforms = new ArrayList<>(props.myParseTransforms); + myExtraFlags = new ArrayList<>(props.myExtraFlags); + } } diff --git a/jps-plugin/src/org/intellij/erlang/jps/model/JpsErlangModuleExtension.java b/jps-plugin/src/org/intellij/erlang/jps/model/JpsErlangModuleExtension.java index 953f8128c..cb3eb60be 100644 --- a/jps-plugin/src/org/intellij/erlang/jps/model/JpsErlangModuleExtension.java +++ b/jps-plugin/src/org/intellij/erlang/jps/model/JpsErlangModuleExtension.java @@ -58,6 +58,10 @@ public List getParseTransforms() { return Collections.unmodifiableList(myProperties.myParseTransforms); } + public List getExtraFlags() { + return Collections.unmodifiableList(myProperties.myExtraFlags); + } + @Nullable public static JpsErlangModuleExtension getExtension(@Nullable JpsModule module) { return module != null ? module.getContainer().getChild(ROLE) : null; diff --git a/src/org/intellij/erlang/facet/ErlangFacetConfiguration.java b/src/org/intellij/erlang/facet/ErlangFacetConfiguration.java index f2cb28446..1028dc1e5 100644 --- a/src/org/intellij/erlang/facet/ErlangFacetConfiguration.java +++ b/src/org/intellij/erlang/facet/ErlangFacetConfiguration.java @@ -55,12 +55,26 @@ public List getParseTransforms() { return Collections.unmodifiableList(myState.myParseTransforms); } + public void setParseTransformsFrom(Iterable parseTransforms) { myState.myParseTransforms = new ArrayList<>(ContainerUtil.newLinkedHashSet(parseTransforms)); } + public void addParseTransforms(Collection newParseTransforms) { if (newParseTransforms.isEmpty()) return; setParseTransformsFrom(ContainerUtil.concat(myState.myParseTransforms, newParseTransforms)); } + + + public List getExtraFlags() { + return Collections.unmodifiableList(myState.myExtraFlags); + } + public void setExtraFlagsFrom(Iterable extraFlags) { + myState.myExtraFlags = new ArrayList<>(ContainerUtil.newLinkedHashSet(extraFlags)); + } + public void addExtraFlags(Collection extraFlags) { + if (extraFlags.isEmpty()) return; + setParseTransformsFrom(ContainerUtil.concat(myState.myExtraFlags, extraFlags)); + } } diff --git a/src/org/intellij/erlang/facet/ui/ErlangFacetEditor.form b/src/org/intellij/erlang/facet/ui/ErlangFacetEditor.form index 66058dda9..3d231d0b4 100644 --- a/src/org/intellij/erlang/facet/ui/ErlangFacetEditor.form +++ b/src/org/intellij/erlang/facet/ui/ErlangFacetEditor.form @@ -8,7 +8,7 @@ - + @@ -33,6 +33,22 @@ + + + + + + + + + + + + + + + + diff --git a/src/org/intellij/erlang/facet/ui/ErlangFacetEditor.java b/src/org/intellij/erlang/facet/ui/ErlangFacetEditor.java index 2dfdf4a6d..3703dddfc 100644 --- a/src/org/intellij/erlang/facet/ui/ErlangFacetEditor.java +++ b/src/org/intellij/erlang/facet/ui/ErlangFacetEditor.java @@ -29,10 +29,14 @@ import javax.swing.*; import javax.swing.event.DocumentEvent; import java.util.List; +import java.util.ArrayList; +import java.util.StringTokenizer; public class ErlangFacetEditor extends FacetEditorTab { private JPanel myRootPanel; private JTextField myParseTransformsEditorField; + private JTextField myFlagsEditorField; + private final ErlangFacetConfiguration myConfiguration; private boolean myIsModified = false; @@ -45,6 +49,12 @@ protected void textChanged(DocumentEvent e) { myIsModified = true; } }); + myFlagsEditorField.getDocument().addDocumentListener(new DocumentAdapter() { + @Override + protected void textChanged(DocumentEvent e) { + myIsModified = true; + } + }); } @Nls @@ -68,6 +78,7 @@ public boolean isModified() { @Override public void reset() { myParseTransformsEditorField.setText(getConfigurationParseTransforms()); + myFlagsEditorField.setText(getConfigurationExtraFlags()); myIsModified = false; } @@ -78,6 +89,7 @@ public void disposeUIResources() { @Override public void apply() { myConfiguration.setParseTransformsFrom(getUiParseTransforms()); + myConfiguration.setExtraFlagsFrom(getUiExtraFlags()); myIsModified = false; } @@ -85,6 +97,35 @@ private String getConfigurationParseTransforms() { return StringUtil.join(myConfiguration.getParseTransforms(), ", "); } + private String getConfigurationExtraFlags() { + return StringUtil.join(myConfiguration.getExtraFlags(), " "); + } + + private List getUiExtraFlags() { + String extraFlagsString = myFlagsEditorField.getText(); + StringTokenizer st=new StringTokenizer(extraFlagsString," '"); + boolean quoted=false; + List result=new ArrayList(); + StringBuilder sb=new StringBuilder(); + while(st.hasMoreTokens()) + { + String token=st.nextToken(); + if(token.equals("'")) { + quoted = !quoted; + } + if(!quoted && token.equals(" ")) { + if(sb.length()>0) + result.add(sb.toString()); + sb = new StringBuilder(); + } else { + sb.append(token); + } + } + if(sb.length()>0) + result.add(sb.toString()); + return result; + } + private List getUiParseTransforms() { String parseTransformsString = myParseTransformsEditorField.getText(); List split = StringUtil.split(parseTransformsString, ","); From 0bb48017ad19494fe74a0d747d44043fa9b0b912 Mon Sep 17 00:00:00 2001 From: Piotr Sokolowski Date: Thu, 6 Oct 2022 12:57:36 +0200 Subject: [PATCH 06/15] reverted beam files --- resources/debugger/beams/debugnode.beam | Bin 1604 -> 1604 bytes resources/debugger/beams/remote_debugger.beam | Bin 1196 -> 1164 bytes .../beams/remote_debugger_listener.beam | Bin 4152 -> 4120 bytes .../beams/remote_debugger_notifier.beam | Bin 1928 -> 1900 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/resources/debugger/beams/debugnode.beam b/resources/debugger/beams/debugnode.beam index 7a3bf2ee23543702c7d986eeaddc2bc522429d93..fa68cc1f88be7bcc704788a457c7c887efca0638 100644 GIT binary patch delta 532 zcmX@YbA)GuJ0s(-$sUZFaSjR&!XggLDl-+>85kUxS>}f_D+Fbjm^z3s3yRD%U>6X` zG;v}P5Oxq&c3>8EP-bRTD0N^o$THD(Wp2`T6`mxZz~Ji6pd#$xF2Fp~fkQ#TfzcsH zS(q_krh*5{h8Nv|^6zSwp@<20RXdm&;OLI8HcvAaKUwD`uHqDc)sK>*5ps zoc{g#L_uogw@It^>ByG1MebR;$K|_^?Zl01m=7;mc8TG^r_~ef{!+k9m8R$Ar=;qo7Uci{arBXh delta 506 zcmZ8bO=}ZT6umDmY2K@O_>wp2v~}TNqaY!j30lQ37^)!^L~6l>n}#Iwn#^RFX=n1W zGtjC(z(HYF;-a_{!F5-5FRtC_KX9Wv(HB7}Ubr9U-g`LbxNux}*F@+?vVkr>vJ6{P zQX>!W>LE6^)-li872Ma>QY+87tJzrCS)4OQ7P368+Q9qOhIr0xXjC$|(FApFa-7=4 zFf3%J;I9a@nHn27`H0RJtV3}_9P0M|)2$cDPxN*>{elSBSs7nr8or5{rrQ=PZn6?0 z#dQp#$}};*c#8={O8@W@BBDG8Oh-gh{W~J%CB_k1NWW!D^UHvUUI0i5e}4*pM$=0l z#OUbC%On5774NO^!CvF_q;!bQjax8t*4TjS9U9To1za8|HXIwz{DsXNuV%45X(>_uN3LHdXmI7S+I2 mqSAx*-s?|aDW`&Jv`iPMPM7H!dXBD~bb9(ft4TArhTu0~je83K diff --git a/resources/debugger/beams/remote_debugger.beam b/resources/debugger/beams/remote_debugger.beam index 1b4fe30b88773ae0c6bfa4617711d9bcac1caffb..9404bfabc4cf19f6880e36557da4047d2a658129 100644 GIT binary patch delta 734 zcmXw#Ur19?9LLYO=Wh32+3f7zZC455&>j*hHwBZj$?;#1na#++UYdWFZN~1}=ISAs zWf_4F&JlD$Fid+W348FRMAQm`Fv7Bjzz`w`A_}2`lIVBUe(*WJ-|x%!_dAC(r3@+Z z;o~RD5fZQE;>xv}XMXAqrSA0qB4oQwc#Zpr znUE;oUfl2IqQ>3C##R{qP6L4nqO*0MIV{l-mZ=$TB3O2rNKgx02+I{JSBZ&QXc)`d zmP)bgww7(`EP-W@$-u2KEPL&2h2-}LLryn*lMApy%|8=-S?^YZ1axDCHXB_hp)Ump zpaBA4c?z~`CuBQ-0jV~fPC_mnIBzNEgl zi&jVs9_ExH3Lc8|;zci2@Z?1W@#>{_5qhp~n-&Bg{N{bkdw(8pPd!kTrF-|&2nAjZ zlpQr_yRPF(PJQrvy|;)EqJVEBAP$5u6;v{=Qq01XauN^>Td@aZv`Eboae;k0a8Z7k|}~HNFP(&5?nG06mOpktl@s_9T~j_foSG4-j9mB>`V9jS<#Xi zgX&@81wOh^_$sy~<0Zqt!i;e_XLZ)X%A~NM*#yB@h#eDzhNiTqMd5rp;F~!-kdm3$I6)G5`$k!H zido370Wg6~Kmz=piSzgp_z-{rWf&$`Duv#M_g@yCWlvAme`@$gr&e3I)7*sbC%X-J zNku9l*=e<_PSdNMC0*O~AgiO`&FS>?4ZjxhoQ_+x>nK~CO>H@DJ!MaMTUF1S@(Nz6 zWOwbx@F~gk(CtFG3aaVd3MnD2WEVQ+T(!CB1V#$8RcCbv3F^s&O@;UjBa>_1|sg;5L5&?nISq diff --git a/resources/debugger/beams/remote_debugger_listener.beam b/resources/debugger/beams/remote_debugger_listener.beam index 59fac05a9a2ffa679e8c2e59fa8893a60247d5e3..e31874b0bc84716a1a1dfa3c65e08237c461cdac 100644 GIT binary patch delta 2370 zcmZ8ieP|rV72mm8`QEK=l+o@=r*Dt6l4a@ivC_%p?@wqm`;QT6lIX;&-cWHiVHF0ryEitvUJeMe3SXxW0 zuB;~3rY$V;xxtR(``XquAhtDm-VbLhnB z@qJ6ns~2Y$&BWz}A9-Xe(8~?rx7D?0j8aLF0DZY}&hYd1adXlWD>45!;ARA#Jq+?3zsuh#J7yTx^ zhU(I#d4d%RvWY9TVRD8f)D{l8sWt=lTb%6lJf?m0aYTw=`yZ0Kaca=$V|u&)Pvl;1 zy-OaXAA0#`Q!_8$d-!XC!amT@#@j?ZiYHrjYm#=YCyj632{nCqb84)@}e zJ8>$gbYhY^GDg*o>9au{4M$Sk%Np)x4N=|eLY}bjrDvw3<4TXJyO=;j+~rhPLKx~^ zPzdhxTQnjbQQJTsS3SVsIDw)b=IP+P$cAKMg6$Wq)Mv#6iqR8#(-DbSuY(HGDr6;= z%_0OMKJ&b0=EY>pL5KSUt0z$6r~Y4BN1$|%2RW)D8)$8mod;6R6hNAYxt28_Z@T2fckhixQ}5!#$MeGR?|633y!aVH$Ac2&W48 zxR3;DQwjY?4X$76CB%ATGg&erB#DAj;s3%4k&QZ#zvcZ1x4dxn!rH? z#Q}R4kEbED;$U^h2sA2)pk4(g6xFAl>0y1?P=cr3A7xF{O4Vi3hSE&lO_F-Lw?{-w zcQurO+(0kQ3d)hlLG~5}72|x9K&ygElog}QS5P(1ZxU!zupebbC~H?B#`z9`n1X7Q zxhU&UP&3Z&5;&y5Ls_{`Al1oy-!C+!=Srtmx0}_7j%$Pb9^Tt+)NaX?YUYXbTeJwr=S5tjiF9|*x+(R6E&h2{p7&6*#Pye zX6$;5I+|VwFV%$l-Ka0KvqwR5&;VOsO_LUy`cr_@!;a9y2;FJ48y9cU>~%dNt-9C1wGh+FJ?=k;4p@N0>jUyJ+7b^oeZJ+ ziT~b+c_TBSxq?2VFXp-6NA_+;znhtL6Uqpr4_Ga!K4ch0*C%_}B-VK{Q|HWV>S3q6 zZ8nKx;28IXZaAz4R_jz0g;rfQKx`QW19-lrxfz(7rKd4+WFAB27rWUR8W#Krbzglwr?Bw;S>$~E{w{EEP8}`(-{o7mHufP7r7Xrp_ z|5dq|4zm~urzP`9etM2|r8<$sMG!;>qA0g+$9HjV?c>|Yty}P2fuM*eB8M7a+8b=GJSiqxUUsqBrspfY2L|ZYpS;x$^VRH{7rI&X)ZB%hTU&tNZ); z^MlVXy@cCee{~U`^oxNxBeMX6BmqA zttXSH+qy8nG_$t6-kMyUP2VXPP7R%#UqH6xs}uOVba|`tapa z`@)U4KkZx?ojbOE_6JkbPk!;)Up`t%ocYJK@7-yt{L+;(@4xf@&_9p&U;W{`^n+X9 z{=|6j==)a(o?HnI4EF65e|*0nT>tLx-g)mQ_wS7U=9QM2pQg=!cMZSXOMdoR{a=ma z3rlSYbi0Gt`;Fpa072|u{^4&SJ5(Gh3zdheLe-(VP-Cb*bTGaC%q$V<2p9hWcKx>Z delta 2329 zcmaJ@O-vlg74Dj9nAhzowx+vb%m8*l4>rp%(0J_S$6yyTK- z>it%|_qsn5zY#FI`2MhA@Zbsj;7KhxmE4ThA8xJeMGwmR(MqYj88zKm+o?qF?CzB} zqDp1u0lwC@qNd9J+I|$vX3gov<%Q-_dGEp6jv0Nt{p2sflP|h|ogtscCW;1XM(F1V z@jXNb;flwc9!^9H=a%70YD$MH5f_{XhGo!M;fCvB?ccPgs+P!7Dx$5@bd#o9HN{US zAClGf?~vUlKEuhO+Ko9s66A402RUuJ(vKSc@Y(I&whL7w6)>8ZyiXKm7? zj&R8{^)%-Ef|D0xjME9qcuI;t27e{53e<43jJwY#|4Cj~PgXC<8~G`932^y)JtWn$ znDb{rz!_snEuTbr<_63o;G&S9Wl8_}5lgz_s{-Zu5ths+ge8%MEL^#;A; z1lq<}Mthe@9WJqyU}pn%PO@$SsYYNK*G@_s4?meDpdDQUN}^LCmEQibzK^>Zwfmw8v46zl>4@jt{q0^Q%#RiHuf8~Qp}kKM_9 z0zJd1Zse^xS@fF&HbMXc&S>C8Wr__`daoL=0RkB=_zaD?GURwt$ps+^^eS*-j@^za zaN#uhz>SL~zQkvx8`|BW7n*pNb`MH*}|5 zU5s#^Kvuz7=&$HbY;vK+O08&{XEUtLa8U*~)%@|f)kIzS$x zl|coasK`U@LkhYU_+tWrf^$eqA#GT}`33%zz$FC&X>CZ$E9hR}&j?&rRp>!tD-y3L z@E7gmNee=Y3*I|7D+iY~4}@CG->Q0EOwU|c~T+P;MTTxCY1 zTI@?FNBpi=ubBx2{m7I@rpbiCWf-^$vS>uVIq)NPjRtlO-9ifkwKedoIpiNjewpAL zyODyyxB-r&x;U}z;8K7)#-`{vLg+jjWmE2yOY`+|o04{Kqwop}hGNdkfIv}SnqTio z5SW5}E6b*_Db?#;s~kq!{3M$pFfFV01O_*w?bSP0h#}7^xP)F!;xx>%8?K#WhUBvW z=GC>3hIX!zR{2KEH<+<2W`!Txy`lS-$#3vnZt&bxa0NA9M~&#roNG%3?=5ifu*&8V zT+{;}!AP;$;>nBxZsD2SQZR;2cp1KV#qpRr2JVx=sDEp8m1fQb#vBB;O z<0z7D#Bdsuu3T)uo*SAoF0Fqj;KR#onYz@dy|S+px5m%hC#|&~p7~FT9s~!sw)b!2 zC+&U2{Kr4vSY2IRtNkQVh#S8eakdPj_H`mp&eZy_^CW7w*hqB*8CwwqaRt$KJkR5p zI-cXl*zk_$LpXLKC}IF{2BBs95otsW(T8Y1o?pPR1)+JgZavpL4#L)h-bf$-p*O6W z*V2D?`EOsF-7mX;+%i7+vp=-_wsh}a@n-1`Zr489!8g4d+ce_k-Tm!ysdBHrIEeNt zxVmpNjSLPCUe>hcO8Md5Ms(l!{>J#wN9DcyLs72s(RQVhtE^XsHlu@Rr*_mbQ#Gd7 zx3*F1@F#carokG&8{4Hj<&}fsO(PlY?X0Y=SN8YTHuhIG@b^ROHcRDFbPt7YZI>b( z{*E|#=5TTyL7dt`{80MN=-YSk|jB`ck6G$kJXlYBX zLyC?nN+P_#aj2E$?d4c?!f>&-OcW8_u&#^#xSi>0jO$C5x5P1vyF4@{%#vQ|z_E)qSD(8ck&eg{PV36?g>t$BBl)f! z78Ml{=_X;P2RaJGA_Yo7u_T&tTb3Zb(Zhsham#ZO5;I?kKsib9ctc?kvu=%Gr4M1& zV+ue+yoyxiA+IKe zoir3CY}v#tt=k|(g2c=QcO?iBAVi8mK*f|)A`8dm1@iMkQjnp1qT5v7P&r|A2s49M z;SHY8a*@x50jMbYf(HNVknl(u%vR>yG^BrZs+ zDZm1fK;l2!hjAHTBIAGyn3yi$Nx(GtEy#XkA;el&BWp(fsk}Sbkfn!5KV4}2vUK*& z*x2T66@92502RzH^0#Cxp=)Rw)*t1r@sB}`uXkG-svCtzC|CdFTDLc{^9-Af1;h0@pKuE c9R?n^G#CQF-pq-)-&&5H!Ls#1R1)z03*BVbkN^Mx delta 1057 zcmZ{iO>7fK6o6-T*51K*;bmq+>X;-$HWz3UZxl;~NR_6plNC}GETkS=Cytk3$Fd`D z5{|aSB_{~7s%lP2>7iHXnM2MM2ZY2OxV7qmBK5+FH%U=XebTr4=FNNaerEoxJ*=&L{t&*>Oal&_f;Lp)oKs7_KQrkIkVY9s_;y z?>WaVc?B9)BN;!A-I&?r$AJJzPs|fX{6^@DJR#=9BT)u?Md)ku!VxbOefPN!@@*D; zK{;rLNy^8}Ye&2X%7qV+t#VbdI0vz7-g%%0N4{h#Co2q?&IMBE#zWf)2QR8=S7wx7 z#8`>dtT2bIxJ(`Z(XnENk9lexa|nW20>gzPas@^CxR#;LO-jS%T2!O_k|DTLB$Q9s zKFAvEQ2yDO5eAeO?6^)h)R6K?!vl1m!h?#}{VDb}3zu&Am&0X5<+ZMaFsCJ}glD(1 z6lht-5Lfv)_7E%90n=e{0MVJX2j zaRSrWTi~ff%4f_8)}n9#>bgIRwaD;>e?=}MI$w(_lCX+|az#c#MJlO7SIargs^-L1 z|D3%7EnQsUCBYC@Ycj6J<@mo^YL_tc6&*6XGVFM^?9VXC2pNIIv4~iiKynC0 z&X1nEzur`+O(70qy{xy@$B~PO^%RJYSi7~IN32+zcd8L`ZuBg3ZSb~r)cHgF{;c#x z`Te60e^%S=Z*F$)pv&lf2fysD(AhB(&ZmvE)J*o1PN~)1O*)-cdp_xRHo9A-eqw`0KV%o`q}teO zVY0>hcUhD8&7`rnRd03g^y>SIO)`c7^^Hcl+uzvSt#9_4iB0Ktd)=gsLEpBz3I2XU dKFJI!0Yb&2pP#<@dvw*Cnf(9CMsc=E$w#9l$Qu9v From 493b1edd504195cd73e7397124341672db8333f8 Mon Sep 17 00:00:00 2001 From: Piotr Sokolowski Date: Fri, 7 Oct 2022 11:35:44 +0200 Subject: [PATCH 07/15] migration to intellij 22.2 - with OTP 20 --- .idea/ant.xml | 3 + .idea/aws.xml | 11 + .idea/codeStyleSettings.xml | 69 +++ .idea/codeStyles/Project.xml | 58 +++ .idea/codeStyles/codeStyleConfig.xml | 5 + .idea/copyright/apache.xml | 8 + .idea/copyright/profiles_settings.xml | 9 + .idea/dbnavigator.xml | 15 +- .idea/dictionaries/ignatov.xml | 13 + .idea/encodings.xml | 6 + .idea/icon.png | Bin 0 -> 927 bytes .idea/inspectionProfiles/Project_Default.xml | 413 ++++++++++++++++++ .../inspectionProfiles/profiles_settings.xml | 7 + .idea/jarRepositories.xml | 5 + .idea/jpa-buddy.xml | 6 + .idea/misc.xml | 3 + .idea/runConfigurations/Compilation_tests.xml | 20 + .idea/runConfigurations/Erlang.xml | 21 + .idea/runConfigurations/Erlang_Compiler.xml | 16 + .idea/runConfigurations/Local_IDE.xml | 21 + .idea/runConfigurations/Tests.xml | 20 + .idea/scopes/scope_settings.xml | 5 + build.gradle | 6 +- jps-plugin/build.gradle | 5 +- 24 files changed, 737 insertions(+), 8 deletions(-) create mode 100644 .idea/ant.xml create mode 100644 .idea/aws.xml create mode 100644 .idea/codeStyleSettings.xml create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/copyright/apache.xml create mode 100644 .idea/copyright/profiles_settings.xml create mode 100644 .idea/dictionaries/ignatov.xml create mode 100644 .idea/encodings.xml create mode 100644 .idea/icon.png create mode 100644 .idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/inspectionProfiles/profiles_settings.xml create mode 100644 .idea/jpa-buddy.xml create mode 100644 .idea/runConfigurations/Compilation_tests.xml create mode 100644 .idea/runConfigurations/Erlang.xml create mode 100644 .idea/runConfigurations/Erlang_Compiler.xml create mode 100644 .idea/runConfigurations/Local_IDE.xml create mode 100644 .idea/runConfigurations/Tests.xml create mode 100644 .idea/scopes/scope_settings.xml diff --git a/.idea/ant.xml b/.idea/ant.xml new file mode 100644 index 000000000..f6e673adc --- /dev/null +++ b/.idea/ant.xml @@ -0,0 +1,3 @@ + + + diff --git a/.idea/aws.xml b/.idea/aws.xml new file mode 100644 index 000000000..d6edbd7b1 --- /dev/null +++ b/.idea/aws.xml @@ -0,0 +1,11 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyleSettings.xml b/.idea/codeStyleSettings.xml new file mode 100644 index 000000000..d958a3143 --- /dev/null +++ b/.idea/codeStyleSettings.xml @@ -0,0 +1,69 @@ + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 000000000..c43f6782b --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,58 @@ + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 000000000..79ee123c2 --- /dev/null +++ b/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/copyright/apache.xml b/.idea/copyright/apache.xml new file mode 100644 index 000000000..227c922be --- /dev/null +++ b/.idea/copyright/apache.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 000000000..3ce798882 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,9 @@ + + + + + + \ No newline at end of file diff --git a/.idea/dbnavigator.xml b/.idea/dbnavigator.xml index 8b38e2086..d68d95837 100644 --- a/.idea/dbnavigator.xml +++ b/.idea/dbnavigator.xml @@ -2,7 +2,7 @@ - + @@ -17,7 +17,8 @@ - + + @@ -50,6 +51,9 @@ + + + @@ -95,6 +99,7 @@ + @@ -141,11 +146,11 @@ - - + + - + diff --git a/.idea/dictionaries/ignatov.xml b/.idea/dictionaries/ignatov.xml new file mode 100644 index 000000000..abfed45ac --- /dev/null +++ b/.idea/dictionaries/ignatov.xml @@ -0,0 +1,13 @@ + + + + autoimported + dialyzer + ebin + erlang + eunit + introducer + rebar + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 000000000..f75895965 --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/icon.png b/.idea/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..95fd49965b75446e0a5e2f687c6c295b03799cc3 GIT binary patch literal 927 zcmV;Q17Q4#P)Fw*OY%liYDtYqD}PpAOo_Z$O4tjs6w7K?ETJU%o3NT2 z*Z1ju)#f@E!Dlx8MbM3hsg@;J3*{TcYjW1`JgNc7m;-$m6~OQVbS> z&3yd>xC~lAZ#I`uCAbEDIi2J%2VO_=H{jo;)Z zmFO5)nT~-b=5-T&0y~&8)#U5JTreG+(^=OJ*?do~#K2;(*D&~xAPg>nSkkpOU>~SA z9J8Dsh_Qi_f;790C#{#xfQN?TM%*^ETYyVJwc#WxOWo4Ex6N?uIc^!y&A=YPhP!QW zZ;xR7THS+e4A>x;Kt0HvH#ihc71lMdoaxh4%SfhFrMrZxtzfEXpmaKrfdv7sUkY^$ z%m}c7d>sQN0XFbWXA>6+2k!!ZGHl>yI`u#*EeuLmqF*@H*q|8rEF3E@C3JE#NCQW)a zH>4SSm=&AzoN^kOscWE>^{uJaxD_56ssPu)D3{0nI$qZ@ppNVl!ay!C7!#>Z+&wVa z;~v$`*l$wQpB9#WlRyVpp>b~x3-p5G>uz1C_ozbD%xC_NECm0`N;KD6B`2|$qHMdUhV7#a z1g_TkaWLOXbowm64g8bJE~?cR;>r0wjiBTFFe2O|N8C27BnzcdC#h#UCd9uL3}!sB znN9j=R&}a-ndQ`P2=Al;*u(!TF>K&JH}F@00RVd^khW&9T^;}c002ovPDHLkV1jcS Bt + + + \ No newline at end of file diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml new file mode 100644 index 000000000..3b312839b --- /dev/null +++ b/.idea/inspectionProfiles/profiles_settings.xml @@ -0,0 +1,7 @@ + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 21dec3a2b..5d275b78f 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -26,5 +26,10 @@ \ No newline at end of file diff --git a/.idea/jpa-buddy.xml b/.idea/jpa-buddy.xml new file mode 100644 index 000000000..966d5f56a --- /dev/null +++ b/.idea/jpa-buddy.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index 082978c3a..1198f095b 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -4,4 +4,7 @@ + + \ No newline at end of file diff --git a/.idea/runConfigurations/Compilation_tests.xml b/.idea/runConfigurations/Compilation_tests.xml new file mode 100644 index 000000000..54916307a --- /dev/null +++ b/.idea/runConfigurations/Compilation_tests.xml @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Erlang.xml b/.idea/runConfigurations/Erlang.xml new file mode 100644 index 000000000..3ee7f2dee --- /dev/null +++ b/.idea/runConfigurations/Erlang.xml @@ -0,0 +1,21 @@ + + + + + + + true + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Erlang_Compiler.xml b/.idea/runConfigurations/Erlang_Compiler.xml new file mode 100644 index 000000000..bf93f0a45 --- /dev/null +++ b/.idea/runConfigurations/Erlang_Compiler.xml @@ -0,0 +1,16 @@ + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Local_IDE.xml b/.idea/runConfigurations/Local_IDE.xml new file mode 100644 index 000000000..de09ed9fa --- /dev/null +++ b/.idea/runConfigurations/Local_IDE.xml @@ -0,0 +1,21 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations/Tests.xml b/.idea/runConfigurations/Tests.xml new file mode 100644 index 000000000..1793e77f2 --- /dev/null +++ b/.idea/runConfigurations/Tests.xml @@ -0,0 +1,20 @@ + + + + + + + + + \ No newline at end of file diff --git a/.idea/scopes/scope_settings.xml b/.idea/scopes/scope_settings.xml new file mode 100644 index 000000000..922003b84 --- /dev/null +++ b/.idea/scopes/scope_settings.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 506250e2a..e2ab875d9 100644 --- a/build.gradle +++ b/build.gradle @@ -12,7 +12,10 @@ dependencies { version = "${version}.$buildNumber" allprojects { - repositories { mavenCentral() } + repositories { + mavenLocal() + mavenCentral() + } apply plugin: 'java' sourceCompatibility = javaVersion targetCompatibility = javaVersion @@ -61,6 +64,7 @@ allprojects { } repositories { + mavenLocal() jcenter() flatDir { dirs 'libs' diff --git a/jps-plugin/build.gradle b/jps-plugin/build.gradle index 2ee8da11b..52299d1b5 100644 --- a/jps-plugin/build.gradle +++ b/jps-plugin/build.gradle @@ -1,9 +1,10 @@ jar.archiveName = "jps-plugin.jar" repositories { + mavenLocal() mavenCentral() } dependencies { - compile group: 'com.github.metadave', name: 'etp', version: '0.7' -} \ No newline at end of file + implementation group: 'com.github.metadave', name: 'etp', version: '0.7' +} From 32a9b3051077adec01f109aee6e12e9655627009 Mon Sep 17 00:00:00 2001 From: Piotr Sokolowski Date: Fri, 7 Oct 2022 11:37:16 +0200 Subject: [PATCH 08/15] updated beams to OTP 20 --- resources/debugger/beams/debugnode.beam | Bin 1604 -> 1604 bytes resources/debugger/beams/remote_debugger.beam | Bin 1164 -> 1196 bytes .../beams/remote_debugger_listener.beam | Bin 4120 -> 4152 bytes .../beams/remote_debugger_notifier.beam | Bin 1900 -> 1928 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/resources/debugger/beams/debugnode.beam b/resources/debugger/beams/debugnode.beam index fa68cc1f88be7bcc704788a457c7c887efca0638..7a3bf2ee23543702c7d986eeaddc2bc522429d93 100644 GIT binary patch delta 506 zcmZ8bO=}ZT6umDmY2K@O_>wp2v~}TNqaY!j30lQ37^)!^L~6l>n}#Iwn#^RFX=n1W zGtjC(z(HYF;-a_{!F5-5FRtC_KX9Wv(HB7}Ubr9U-g`LbxNux}*F@+?vVkr>vJ6{P zQX>!W>LE6^)-li872Ma>QY+87tJzrCS)4OQ7P368+Q9qOhIr0xXjC$|(FApFa-7=4 zFf3%J;I9a@nHn27`H0RJtV3}_9P0M|)2$cDPxN*>{elSBSs7nr8or5{rrQ=PZn6?0 z#dQp#$}};*c#8={O8@W@BBDG8Oh-gh{W~J%CB_k1NWW!D^UHvUUI0i5e}4*pM$=0l z#OUbC%On5774NO^!CvF_q;!bQjax8t*4TjS9U9To1za8|HXIwz{DsXNuV%45X(>_uN3LHdXmI7S+I2 mqSAx*-s?|aDW`&Jv`iPMPM7H!dXBD~bb9(ft4TArhTu0~je83K delta 532 zcmX@YbA)GuJ0s(-$sUZFaSjR&!XggLDl-+>85kUxS>}f_D+Fbjm^z3s3yRD%U>6X` zG;v}P5Oxq&c3>8EP-bRTD0N^o$THD(Wp2`T6`mxZz~Ji6pd#$xF2Fp~fkQ#TfzcsH zS(q_krh*5{h8Nv|^6zSwp@<20RXdm&;OLI8HcvAaKUwD`uHqDc)sK>*5ps zoc{g#L_uogw@It^>ByG1MebR;$K|_^?Zl01m=7;mc8TG^r_~ef{!+k9m8R$Ar=;qo7Uci{arBXh diff --git a/resources/debugger/beams/remote_debugger.beam b/resources/debugger/beams/remote_debugger.beam index 9404bfabc4cf19f6880e36557da4047d2a658129..1b4fe30b88773ae0c6bfa4617711d9bcac1caffb 100644 GIT binary patch delta 702 zcmZXQO=uHA6vt zi&jVs9_ExH3Lc8|;zci2@Z?1W@#>{_5qhp~n-&Bg{N{bkdw(8pPd!kTrF-|&2nAjZ zlpQr_yRPF(PJQrvy|;)EqJVEBAP$5u6;v{=Qq01XauN^>Td@aZv`Eboae;k0a8Z7k|}~HNFP(&5?nG06mOpktl@s_9T~j_foSG4-j9mB>`V9jS<#Xi zgX&@81wOh^_$sy~<0Zqt!i;e_XLZ)X%A~NM*#yB@h#eDzhNiTqMd5rp;F~!-kdm3$I6)G5`$k!H zido370Wg6~Kmz=piSzgp_z-{rWf&$`Duv#M_g@yCWlvAme`@$gr&e3I)7*sbC%X-J zNku9l*=e<_PSdNMC0*O~AgiO`&FS>?4ZjxhoQ_+x>nK~CO>H@DJ!MaMTUF1S@(Nz6 zWOwbx@F~gk(CtFG3aaVd3MnD2WEVQ+T(!CB1V#$8RcCbv3F^s&O@;UjBa>_1|sg;5L5&?nISq delta 734 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 diff --git a/resources/debugger/beams/remote_debugger_notifier.beam b/resources/debugger/beams/remote_debugger_notifier.beam index 9d6c13d02146cd22946396a07452f61407ed444f..0bd74fc198fbec68acf8c7bb8ebc138389f500f5 100644 GIT binary patch delta 1057 zcmZ{iO>7fK6o6-T*51K*;bmq+>X;-$HWz3UZxl;~NR_6plNC}GETkS=Cytk3$Fd`D z5{|aSB_{~7s%lP2>7iHXnM2MM2ZY2OxV7qmBK5+FH%U=XebTr4=FNNaerEoxJ*=&L{t&*>Oal&_f;Lp)oKs7_KQrkIkVY9s_;y z?>WaVc?B9)BN;!A-I&?r$AJJzPs|fX{6^@DJR#=9BT)u?Md)ku!VxbOefPN!@@*D; zK{;rLNy^8}Ye&2X%7qV+t#VbdI0vz7-g%%0N4{h#Co2q?&IMBE#zWf)2QR8=S7wx7 z#8`>dtT2bIxJ(`Z(XnENk9lexa|nW20>gzPas@^CxR#;LO-jS%T2!O_k|DTLB$Q9s zKFAvEQ2yDO5eAeO?6^)h)R6K?!vl1m!h?#}{VDb}3zu&Am&0X5<+ZMaFsCJ}glD(1 z6lht-5Lfv)_7E%90n=e{0MVJX2j zaRSrWTi~ff%4f_8)}n9#>bgIRwaD;>e?=}MI$w(_lCX+|az#c#MJlO7SIargs^-L1 z|D3%7EnQsUCBYC@Ycj6J<@mo^YL_tc6&*6XGVFM^?9VXC2pNIIv4~iiKynC0 z&X1nEzur`+O(70qy{xy@$B~PO^%RJYSi7~IN32+zcd8L`ZuBg3ZSb~r)cHgF{;c#x z`Te60e^%S=Z*F$)pv&lf2fysD(AhB(&ZmvE)J*o1PN~)1O*)-cdp_xRHo9A-eqw`0KV%o`q}teO zVY0>hcUhD8&7`rnRd03g^y>SIO)`c7^^Hcl+uzvSt#9_4iB0Ktd)=gsLEpBz3I2XU dKFJI!0Yb&2pP#<@dvw*Cnf(9CMsc=E$w#9l$Qu9v delta 1044 zcmYL{e~6St7{_Pcnca7K+xMJ(=e;|3&)pq;7X*{L*Vxjol5uqte{ijZ!u3ykdaLaj zcgyX0`A4uzrc?y&wf{5`q;?jR$ez$YC2|!9fe4}^5eQc#2#U!;`G;aX<0cJ!W}bQG znPt`{80MN=-YSk|jB`ck6G$kJXlYBX zLyC?nN+P_#aj2E$?d4c?!f>&-OcW8_u&#^#xSi>0jO$C5x5P1vyF4@{%#vQ|z_E)qSD(8ck&eg{PV36?g>t$BBl)f! z78Ml{=_X;P2RaJGA_Yo7u_T&tTb3Zb(Zhsham#ZO5;I?kKsib9ctc?kvu=%Gr4M1& zV+ue+yoyxiA+IKe zoir3CY}v#tt=k|(g2c=QcO?iBAVi8mK*f|)A`8dm1@iMkQjnp1qT5v7P&r|A2s49M z;SHY8a*@x50jMbYf(HNVknl(u%vR>yG^BrZs+ zDZm1fK;l2!hjAHTBIAGyn3yi$Nx(GtEy#XkA;el&BWp(fsk}Sbkfn!5KV4}2vUK*& z*x2T66@92502RzH^0#Cxp=)Rw)*t1r@sB}`uXkG-svCtzC|CdFTDLc{^9-Af1;h0@pKuE c9R?n^G#CQF-pq-)-&&5H!Ls#1R1)z03*BVbkN^Mx From 374b61390b03318e7a6be7ae40f7c060935ae35d Mon Sep 17 00:00:00 2001 From: Piotr Sokolowski Date: Thu, 9 Feb 2023 08:40:31 +0100 Subject: [PATCH 09/15] changes --- build.gradle | 2 +- gradle.properties | 2 +- resources/META-INF/java-deps.xml | 2 +- .../remote/ErlangRemoteDebugRunConfigurationType.java | 6 ++++++ .../erlang/eunit/ErlangUnitRunConfigurationType.java | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index bb9a4082f..8500d4373 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'org.jetbrains.intellij' version "1.10.0" + id 'org.jetbrains.intellij' version "1.12.0" } dependencies { diff --git a/gradle.properties b/gradle.properties index 666c7f0b2..dc9d29d45 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,7 +3,7 @@ # https://www.jetbrains.com/intellij-repository/snapshots version = 0.11 -ideaVersion = 223.7571-EAP-CANDIDATE-SNAPSHOT +ideaVersion = 223.8617-EAP-CANDIDATE-SNAPSHOT javaVersion = 17 javaTargetVersion = 17 buildNumber = SNAPSHOT diff --git a/resources/META-INF/java-deps.xml b/resources/META-INF/java-deps.xml index 97d416743..b5407af7f 100644 --- a/resources/META-INF/java-deps.xml +++ b/resources/META-INF/java-deps.xml @@ -17,7 +17,7 @@ - + diff --git a/src/org/intellij/erlang/debugger/remote/ErlangRemoteDebugRunConfigurationType.java b/src/org/intellij/erlang/debugger/remote/ErlangRemoteDebugRunConfigurationType.java index 0e03567e0..bcf5d1b98 100644 --- a/src/org/intellij/erlang/debugger/remote/ErlangRemoteDebugRunConfigurationType.java +++ b/src/org/intellij/erlang/debugger/remote/ErlangRemoteDebugRunConfigurationType.java @@ -38,6 +38,12 @@ private ErlangRemoteDebugRunConfigurationType() { public RunConfiguration createTemplateConfiguration(@NotNull Project project) { return new ErlangRemoteDebugRunConfiguration(project, "Erlang remote node"); } + + @NotNull + @Override + public String getId() { + return "Erlang Remote Node"; + } }); } diff --git a/src/org/intellij/erlang/eunit/ErlangUnitRunConfigurationType.java b/src/org/intellij/erlang/eunit/ErlangUnitRunConfigurationType.java index 8cf58df0d..b1338fb76 100644 --- a/src/org/intellij/erlang/eunit/ErlangUnitRunConfigurationType.java +++ b/src/org/intellij/erlang/eunit/ErlangUnitRunConfigurationType.java @@ -35,6 +35,7 @@ private ErlangUnitRunConfigurationType() { addFactory(new ErlangUnitConfigurationFactory(this)); } + public static ErlangUnitRunConfigurationType getInstance() { return CONFIGURATION_TYPE_EP.findExtensionOrFail(ErlangUnitRunConfigurationType.class); } From db2338709ddac46113b9601ef9e5bd30f3c4999d Mon Sep 17 00:00:00 2001 From: Piotr Sokolowski Date: Thu, 9 Feb 2023 09:35:25 +0100 Subject: [PATCH 10/15] Fix class loader handling --- .idea/emacs.xml | 6 ++++++ .idea/jarRepositories.xml | 5 +++++ .idea/misc.xml | 4 ++-- .../erlang/debugger/xdebug/ErlangXDebugProcess.java | 3 ++- 4 files changed, 15 insertions(+), 3 deletions(-) create mode 100644 .idea/emacs.xml diff --git a/.idea/emacs.xml b/.idea/emacs.xml new file mode 100644 index 000000000..a1e816fc0 --- /dev/null +++ b/.idea/emacs.xml @@ -0,0 +1,6 @@ + + + + + \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml index 5d275b78f..29936c2f4 100644 --- a/.idea/jarRepositories.xml +++ b/.idea/jarRepositories.xml @@ -31,5 +31,10 @@