From a9146eb62480d81bc2cce4a794e432e80a66ad90 Mon Sep 17 00:00:00 2001 From: Googler Date: Fri, 31 Mar 2017 23:50:22 +0000 Subject: Modify package parser regex to handle scala packages too. RELNOTES: None. PiperOrigin-RevId: 151884306 --- .../com/google/devtools/build/android/ideinfo/PackageParser.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/tools/android/java/com/google') 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); } -- cgit v1.2.3