Skip to content

Commit da1a26c

Browse files
committed
963: fixed name and version bug
1 parent 10dac23 commit da1a26c

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

src/com/magento/idea/magento2plugin/actions/generation/generator/ModuleComposerJsonGenerator.java

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -158,10 +158,9 @@ private String getDependenciesString(final List dependenciesList) {
158158
private Pair<String, String> getDependencyData(
159159
final String dependency
160160
) {
161-
String version = "*";
162-
String moduleName = camelCaseToHyphen.convert(dependency).replace(
163-
"_-", "/"
164-
);
161+
String version = "";
162+
String moduleName = "";
163+
165164
try {
166165
final PsiDirectory moduleDir = moduleIndex.getModuleDirectoryByModuleName(dependency);
167166

@@ -186,16 +185,18 @@ private Pair<String, String> getDependencyData(
186185
final JSONObject jsonObject = (JSONObject) obj;
187186
final String versionJsonElement = jsonObject.get("version") == null
188187
? "*" : jsonObject.get("version").toString();
189-
final String nameJsonElement = jsonObject.get("name").toString();
190188

189+
if (jsonObject.get("name") == null) {
190+
return Pair.create("", "");
191+
}
192+
moduleName = jsonObject.get("name").toString().trim();
191193
version = versionJsonElement;
192-
final int minorVersionSeparator = version.lastIndexOf('.');
193-
version = new StringBuilder(version)
194-
.replace(minorVersionSeparator + 1, version.length(),"*")
195-
.toString();
196194

197-
if (nameJsonElement != null) {
198-
moduleName = nameJsonElement;
195+
if (!versionJsonElement.equals("*")) {
196+
final int minorVersionSeparator = version.lastIndexOf('.');
197+
version = new StringBuilder(version)
198+
.replace(minorVersionSeparator + 1, version.length(),"*")
199+
.toString();
199200
}
200201
}
201202
} else {

0 commit comments

Comments
 (0)