Alternative methods for progress reporting

2012-11-12 16:49:47 +04:00
parent 1e3b334f15
commit ef403cc91a
11 changed files with 263 additions and 14 deletions
@@ -26,7 +26,8 @@ public enum CompilerMessageSeverity {
    ERROR,
    WARNING,
    EXCEPTION,
-    LOGGING;
+    LOGGING,
+    OUTPUT;

    public static final EnumSet<CompilerMessageSeverity> ERRORS = EnumSet.of(ERROR, EXCEPTION);
 }
@@ -0,0 +1,79 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.cli.common.messages;
+
+import com.intellij.openapi.util.text.StringUtil;
+import com.intellij.util.containers.ContainerUtil;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.io.File;
+import java.util.Collection;
+
+public class OutputMessageUtil {
+    private static final String SOURCE_FILES_PREFIX = "Sources:";
+    private static final String OUTPUT_FILES_PREFIX = "Output:";
+
+    public static String formatOutputMessage(Collection<File> sourceFiles, File outputFile) {
+        return OUTPUT_FILES_PREFIX + "\n" + outputFile.getPath() + "\n" +
+               SOURCE_FILES_PREFIX + "\n" + StringUtil.join(sourceFiles, "\n");
+    }
+
+    @Nullable
+    public static Output parseOutputMessage(@NotNull String message) {
+        String[] strings = message.split("\n");
+
+        // Must have at least one line per prefix
+        if (strings.length <= 2) return null;
+
+        if (!OUTPUT_FILES_PREFIX.equals(strings[0])) return null;
+
+        if (SOURCE_FILES_PREFIX.equals(strings[1])) {
+            // Output:
+            // Sources:
+            // ...
+            return new Output(parseSourceFiles(strings, 2), null);
+        }
+        else {
+            File outputFile = new File(strings[1]);
+
+            if (!SOURCE_FILES_PREFIX.equals(strings[2])) return null;
+
+            return new Output(parseSourceFiles(strings, 3), outputFile);
+        }
+    }
+
+    private static Collection<File> parseSourceFiles(String[] strings, int start) {
+        Collection<File> sourceFiles = ContainerUtil.newArrayList();
+        for (int i = start; i < strings.length; i++) {
+            sourceFiles.add(new File(strings[i]));
+        }
+        return sourceFiles;
+    }
+
+    public static class Output {
+        @NotNull
+        public final Collection<File> sourceFiles;
+        @Nullable
+        public final File outputFile;
+
+        public Output(@NotNull Collection<File> sourceFiles, @Nullable File outputFile) {
+            this.sourceFiles = sourceFiles;
+            this.outputFile = outputFile;
+        }
+    }
+}
@@ -19,10 +19,6 @@ package org.jetbrains.jet.cli.common.messages;
 import com.google.common.collect.LinkedHashMultimap;
 import com.google.common.collect.Multimap;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.cli.common.messages.CompilerMessageLocation;
-import org.jetbrains.jet.cli.common.messages.CompilerMessageSeverity;
-import org.jetbrains.jet.cli.common.messages.MessageCollector;
-import org.jetbrains.jet.cli.common.messages.MessageRenderer;

 import java.io.PrintStream;
 import java.util.Collection;
@@ -52,7 +48,7 @@ public class PrintingMessageCollector implements MessageCollector {
            @NotNull String message,
            @NotNull CompilerMessageLocation location) {
        String text = messageRenderer.render(severity, message, location);
-        if (severity == CompilerMessageSeverity.LOGGING) {
+        if (severity == CompilerMessageSeverity.LOGGING || severity == CompilerMessageSeverity.OUTPUT) {
            if (!verbose) {
                return;
            }