eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-01-30 20:01:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Added tests for ImportStatement and some minor style clean up.

Browse Source
This commit is contained in:
Sam Pottinger
2019-11-04 18:17:24 -08:00
parent 2aaaeb7253
commit 2c85b89173
5 changed files with 155 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/src/processing/mode/java/JavaEditor.java
View File

@@ -1811,7 +1811,7 @@ public class JavaEditor extends Editor {
if (!imports.isEmpty()) {
ArrayList<String> importHeaders = new ArrayList<>();
for (ImportStatement importStatement : imports) {
importHeaders.add(importStatement.getFullClassName());
importHeaders.add(importStatement.getFullMemberName());
}
List<AvailableContribution> installLibsHeaders =
getNotInstalledAvailableLibs(importHeaders);

2
java/src/processing/mode/java/pdex/CompletionGenerator.java
View File

@@ -739,7 +739,7 @@ public class CompletionGenerator {
.map(list -> list.stream()
.map(is -> {
if (is.getMemberName().equals(finalClassName)) {
return is.getFullClassName();
return is.getFullMemberName();
} else if (is.isStarredImport()) {
return is.getPackageName() + "." + finalClassName;
}

13
java/src/processing/mode/java/pdex/ImportStatement.java
View File

@@ -2,7 +2,7 @@
/*
Part of the Processing project - http://processing.org
Copyright (c) 2012-15 The Processing Foundation
Copyright (c) 2012-19 The Processing Foundation
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License version 2
@@ -25,9 +25,6 @@ import java.util.regex.Matcher;
/**
* Wrapper for import statements
*
* @author Manindra Moharana &lt;me@mkmoharana.com&gt;
*
*/
public class ImportStatement {
@@ -84,9 +81,9 @@ public class ImportStatement {
* Prase an import statement from a fully qualified name.
*
* @param importString The fully qualified name from which an import statement should be built. This supports static
* prepended so both "java.util.List" and "static org.processing.package.Factory.build" are supported. Note that
* the static prepending is required if the import is static.
* @return
* prepended so both "java.util.List" and "static org.processing.package.Factory.build" are supported but
* "import java.util.List;" is not. Note that the static prepending is required if the import is static.
* @return Newly parsed import statement information.
*/
public static ImportStatement parse(String importString) {
Matcher matcher = SourceUtils.IMPORT_REGEX_NO_KEYWORD.matcher(importString);
@@ -145,7 +142,7 @@ public class ImportStatement {
* "org.processing.package.Factory.build" would be returned for
* "import static org.processing.package.Factory.build".
*/
public String getFullClassName(){
public String getFullMemberName(){
return packageName + "." + memberName;
}

2
java/src/processing/mode/java/pdex/PreprocessingService.java
View File

@@ -403,7 +403,7 @@ public class PreprocessingService {
new StringWriter(),
result.scrubbedPdeCode,
codeFolderImports.stream()
.map(ImportStatement::getFullClassName)
.map(ImportStatement::getFullMemberName)
.collect(Collectors.toList())
);
} catch (SketchException e) {