Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Fix decompilation of Kernel that causes syntax highlighting crashes #1877

Merged
merged 8 commits into from
Jan 15, 2021
Merged

Fix decompilation of Kernel that causes syntax highlighting crashes #1877

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7af8b0c
Rename .java to .kt
KronicDeth Jan 13, 2021
46a0584
Convert beam.psi.ModuleImpl to Kotlin
KronicDeth Jan 13, 2021
a03c8a8
Connect compiled stubs to decompiled source by name/arity
KronicDeth Jan 13, 2021
3278127
Allow decompile source to map to entire arity range
KronicDeth Jan 14, 2021
ad4730d
Use correct macro for signature from docs
KronicDeth Jan 15, 2021
a63eb4e
Use ~S for docs from Docs chunk
KronicDeth Jan 15, 2021
d4a7b1c
Log an error if Code function can't be matched to decompiled source
KronicDeth Jan 15, 2021
70b6b83
Add #1877 to changelogs
KronicDeth Jan 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Use correct macro for signature from docs 
Ensures that defmacro is used for macros instead of hard-coding `def` as before.
  • Loading branch information
@KronicDeth
KronicDeth committed Jan 15, 2021
commit ad4730dea23ffb22ba3873669f081f11176dce1d
2 changes: 1 addition & 1 deletion src/org/elixir_lang/beam/Decompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,7 @@ private static void appendCallDefinitions(@NotNull StringBuilder decompiled,
? documentation.getDocs().getSignatures(macroNameArity.name, macroNameArity.arity)
: null;
if (signaturesFromDocs != null && !signaturesFromDocs.isEmpty()){
decompiled.append(" def ");
decompiled.append(" ").append(macroNameArity.macro).append(' ');
Optional<String> optional = signaturesFromDocs.stream().findFirst();
decompiled.append(optional.get());
decompiled.append(" do\n # body not decompiled\n end\n");
Expand Down