aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/tools/android/java/com/google
diff options
context:
space:
mode:
authorGravatar Googler <noreply@google.com>2017-03-31 23:50:22 +0000
committerGravatar Marcel Hlopko <hlopko@google.com>2017-04-03 13:37:37 +0200
commita9146eb62480d81bc2cce4a794e432e80a66ad90 (patch)
treefea60eabb4384097cc77c3432a07c478d5d23e24 /src/tools/android/java/com/google
parentdf22958d81b78ae9edd0a0874e5595cfa189877c (diff)
Modify package parser regex to handle scala packages too.
RELNOTES: None. PiperOrigin-RevId: 151884306
Diffstat (limited to 'src/tools/android/java/com/google')
-rw-r--r--src/tools/android/java/com/google/devtools/build/android/ideinfo/PackageParser.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/tools/android/java/com/google/devtools/build/android/ideinfo/PackageParser.java b/src/tools/android/java/com/google/devtools/build/android/ideinfo/PackageParser.java
index a9a8ccebf9..d586e5e194 100644
--- a/src/tools/android/java/com/google/devtools/build/android/ideinfo/PackageParser.java
+++ b/src/tools/android/java/com/google/devtools/build/android/ideinfo/PackageParser.java
@@ -80,8 +80,8 @@ public class PackageParser {
private static final Logger logger = Logger.getLogger(PackageParser.class.getName());
- private static final Pattern JAVA_PACKAGE_PATTERN =
- Pattern.compile("^\\s*package\\s+([\\w\\.]+);");
+ private static final Pattern PACKAGE_PATTERN =
+ Pattern.compile("^\\s*package\\s+([\\w\\.]+)");
public static void main(String[] args) throws Exception {
PackageParserOptions options = parseArgs(args);
@@ -194,7 +194,7 @@ public class PackageParser {
public static String parseDeclaredPackage(@Nonnull BufferedReader reader) throws IOException {
String line;
while ((line = reader.readLine()) != null) {
- Matcher packageMatch = JAVA_PACKAGE_PATTERN.matcher(line);
+ Matcher packageMatch = PACKAGE_PATTERN.matcher(line);
if (packageMatch.find()) {
return packageMatch.group(1);
}