Merge pull request #50 from dynatrace-oss/feature/dql/allowing-query-configuration

Adding the query configuration fields into the toolbar for DQL files

Author: dorian-krefft-dt

src/main/java/pl/thedeem/intellij/dql/DQLUtil.java

@@ -12,6 +12,8 @@
 import com.intellij.psi.util.PsiTreeUtil;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jsoup.internal.StringUtil;
+import pl.thedeem.intellij.dql.definition.model.DQLDurationType;
 import pl.thedeem.intellij.dql.definition.model.MappedParameter;
 import pl.thedeem.intellij.dql.definition.model.Parameter;
 import pl.thedeem.intellij.dql.psi.DQLFieldExpression;
@@ -24,13 +26,21 @@
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.time.format.DateTimeFormatter;
+import java.time.format.DateTimeParseException;
+import java.time.temporal.TemporalAccessor;
 import java.util.*;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 public class DQLUtil {
     public final static DateTimeFormatter DQL_DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss.SSS");
     public final static DateTimeFormatter USER_FRIENDLY_DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss.SSS");
-
+    public final static Pattern DURATION_PATTERN = Pattern.compile(
+            "^\\s*(-?)\\s*(\\d+)\\s*("
+                    + String.join("|", DQLDurationType.getTypes()) +
+                    ")$");
+    
     private final static String PARTIAL_DQL_NAME = ".partial.";
     private final static String CREDENTIALS_PREFIX = "pl.thedeem.intellij.dql/";
 
@@ -160,4 +170,29 @@ public static CredentialAttributes createCredentialAttributes(@NotNull String cr
                 })
                 .collect(Collectors.toList());
     }
+
+    public static @Nullable String parseUserTime(@NotNull String text) throws IllegalArgumentException {
+        if (StringUtil.isBlank(text)) {
+            return null;
+        }
+        Matcher durationMatcher = DURATION_PATTERN.matcher(text);
+        if (durationMatcher.matches()) {
+            int negative = durationMatcher.group(1).trim().isBlank() ? 0 : -1;
+            int amount = Integer.parseInt(durationMatcher.group(2)) * negative;
+            String unit = durationMatcher.group(3);
+            DQLDurationType type = DQLDurationType.getByType(unit);
+            if (type == null) {
+                throw new IllegalArgumentException("Invalid duration type: " + unit);
+            }
+            Instant instant = type.getInstant(amount, Instant.now());
+            return DQLUtil.DQL_DATE_FORMATTER.format(instant.atZone(ZoneId.systemDefault()));
+        }
+
+        try {
+            TemporalAccessor parsed = DQLUtil.DQL_DATE_FORMATTER.parse(text);
+            return DQLUtil.DQL_DATE_FORMATTER.format(parsed);
+        } catch (DateTimeParseException ex) {
+            throw new IllegalArgumentException("Invalid date format", ex);
+        }
+    }
 }

src/main/java/pl/thedeem/intellij/dql/actions/ActionUtils.java

@@ -9,8 +9,11 @@
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.fileEditor.FileEditor;
 import com.intellij.openapi.fileEditor.TextEditor;
+import com.intellij.openapi.project.Project;
+import com.intellij.openapi.vfs.VirtualFile;
 import com.intellij.psi.PsiElement;
 import com.intellij.psi.PsiFile;
+import com.intellij.psi.PsiManager;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import pl.thedeem.intellij.dql.DQLFileType;
@@ -33,20 +36,37 @@ public abstract class ActionUtils {
         return serviceClass.cast(serviceKey);
     }
 
-    public static @Nullable PsiFile getRelatedPsiFile(@Nullable PsiFile originalFile, @Nullable Editor editor, @Nullable PsiElement psiElement) {
-        if (originalFile == null || editor == null) {
+    public static @Nullable PsiFile getRelatedPsiFile(@NotNull AnActionEvent e) {
+        Project project = e.getProject();
+        if (project == null) {
             return null;
         }
-        if (!DQLFileType.INSTANCE.equals(originalFile.getFileType())) {
-            InjectedLanguageManager manager = InjectedLanguageManager.getInstance(originalFile.getProject());
-            PsiElement injectedElement = manager.findInjectedElementAt(originalFile, editor.getCaretModel().getOffset());
+        PsiFile psiFile = e.getData(CommonDataKeys.PSI_FILE);
+        if (psiFile == null) {
+            VirtualFile virtualFile = e.getData(CommonDataKeys.VIRTUAL_FILE);
+            if (virtualFile != null) {
+                psiFile = PsiManager.getInstance(project).findFile(virtualFile);
+            }
+
+        }
+        if (psiFile == null) {
+            return null;
+        }
+        if (!DQLFileType.INSTANCE.equals(psiFile.getFileType())) {
+            InjectedLanguageManager manager = InjectedLanguageManager.getInstance(psiFile.getProject());
+            Editor editor = ActionUtils.getEditor(e);
+            if (editor == null) {
+                return null;
+            }
+            PsiElement psiElement = e.getData(CommonDataKeys.PSI_ELEMENT);
+            PsiElement injectedElement = manager.findInjectedElementAt(psiFile, editor.getCaretModel().getOffset());
             if (injectedElement != null && DQLFileType.INSTANCE.equals(injectedElement.getContainingFile().getFileType())) {
                 return injectedElement.getContainingFile();
             } else if (psiElement != null) {
                 return DQLFileType.INSTANCE.equals(psiElement.getContainingFile().getFileType()) ? psiElement.getContainingFile() : null;
             }
         }
-        return originalFile;
+        return psiFile;
     }
 
     public static boolean isNotRelatedToDQL(@NotNull AnActionEvent e) {

src/main/java/pl/thedeem/intellij/dql/actions/RunDQLQueryAction.java

@@ -0,0 +1,55 @@
+package pl.thedeem.intellij.dql.actions.executionToolbar;
+
+import com.intellij.ui.components.JBTextField;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import javax.swing.*;
+import javax.swing.text.AbstractDocument;
+import javax.swing.text.AttributeSet;
+import javax.swing.text.BadLocationException;
+import javax.swing.text.DocumentFilter;
+
+public abstract class AbstractNumericFieldAction extends AbstractTextFieldAction<Long> {
+    public AbstractNumericFieldAction(@Nullable Long value, @NotNull String text, @Nullable String description, @Nullable Icon icon) {
+        super(value != null ? String.valueOf(value) : null, text, description, icon);
+    }
+
+    @Override
+    protected JBTextField createTextField() {
+        JBTextField result = super.createTextField();
+        ((AbstractDocument) result.getDocument()).setDocumentFilter(new NumericFilter());
+        return result;
+    }
+
+    private static class NumericFilter extends DocumentFilter {
+        @Override
+        public void insertString(FilterBypass fb, int offset, String string, AttributeSet attr)
+                throws BadLocationException {
+            if (string.matches("-?\\d*")) {
+                super.insertString(fb, offset, string, attr);
+            }
+        }
+
+        @Override
+        public void replace(FilterBypass fb, int offset, int length, String text, AttributeSet attrs)
+                throws BadLocationException {
+            if (text.matches("-?\\d*")) {
+                super.replace(fb, offset, length, text, attrs);
+            }
+        }
+    }
+
+    @Override
+    public Long getValue() {
+        String text = myField.getText();
+        if (text == null || text.isEmpty()) {
+            return null;
+        }
+        try {
+            return Long.valueOf(text);
+        } catch (NumberFormatException ignored) {
+            return null;
+        }
+    }
+}