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

Quote module names and macro names that contain - #861

Merged
merged 3 commits into from
Oct 21, 2017
Merged

Quote module names and macro names that contain - #861

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
104e898
Failing regression test for #860
KronicDeth Oct 20, 2017
84a4d5b
Quote - in addition to # for Unquoted decompiler
KronicDeth Oct 20, 2017
fd81625
Quote atom module names that contain -
KronicDeth Oct 20, 2017
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
Quote atom module names that contain -
  • Loading branch information
@KronicDeth
KronicDeth committed Oct 20, 2017
commit fd816255bc499999630aa6488935f739e4a4b9d4
17 changes: 15 additions & 2 deletions src/org/elixir_lang/beam/Decompiler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ private static void error(@NotNull MacroNameArity macroNameArity) {
com.intellij.openapi.diagnostic.Logger logger = com.intellij.openapi.diagnostic.Logger.getInstance(
Decompiler.class
);
String fullUserMessage = "No decompiler for MacroNameArity (" + macroNameArity +")";
String fullUserMessage = "No decompiler for MacroNameArity (" + macroNameArity + ")";
logger.error(
LogMessageEx.createEvent(
fullUserMessage,
Expand All @@ -154,11 +154,24 @@ public static String defmoduleArgument(String moduleName) {
if (moduleName.startsWith(ELIXIR_PREFIX)) {
defmoduleArgument = moduleName.substring(ELIXIR_PREFIX.length());
} else {
defmoduleArgument = ":" + moduleName;
defmoduleArgument = ":" + moduleNameToAtomName(moduleName);
}
return defmoduleArgument;
}

@NotNull
private static String moduleNameToAtomName(@NotNull String moduleName) {
String atom;

if (moduleName.contains("-")) {
atom = "\"" + moduleName + "\"";
} else {
atom = moduleName;
}

return atom;
}

@NotNull
@Override
public CharSequence decompile(@NotNull VirtualFile virtualFile) {
Expand Down