Implement inlined annotations

Author: vfateev

openapi-feature/feature.xml

@@ -2,7 +2,7 @@
 <feature
       id="com.xliic.openapi"
       label="OpenAPI (Swagger) Editor"
-      version="1.0.53"
+      version="1.0.54"
       provider-name="42Crunch"
       plugin="openapi-plugin">
 
@@ -703,7 +703,7 @@ For more information on this, and how to apply and follow the GNU AGPL, see
          id="openapi-plugin"
          download-size="0"
          install-size="0"
-         version="1.0.53"
+         version="1.0.54"
          unpack="false"/>
 
    <plugin

openapi-feature/pom.xml

@@ -7,7 +7,7 @@
 	<parent>
 		<groupId>com.xliic.openapi</groupId>
 		<artifactId>openapi-parent</artifactId>
-		<version>1.0.53</version>
+		<version>1.0.54</version>
 	</parent>
 
 	<artifactId>com.xliic.openapi</artifactId>

openapi-plugin/META-INF/MANIFEST.MF

@@ -2,7 +2,7 @@ Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-Name: Eclipse-openapi
 Bundle-SymbolicName: openapi-plugin;singleton:=true
-Bundle-Version: 1.0.53
+Bundle-Version: 1.0.54
 Require-Bundle: org.eclipse.ui,
  org.eclipse.core.runtime,
  org.eclipse.core.resources;bundle-version="3.13.700",

openapi-plugin/icons/scanAnno.png

@@ -274,6 +274,10 @@
 			<service serviceClass="com.xliic.openapi.config.IConfigService"></service>
 		</serviceFactory>	
 
+		<serviceFactory factoryClass="com.xliic.openapi.inlined.AnnotationServiceFactory">
+			<service serviceClass="com.xliic.openapi.inlined.IAnnotationService"></service>
+		</serviceFactory>	
+		
 	</extension>
 
    <extension

openapi-plugin/icons/tryitAnno.png

@@ -5,7 +5,7 @@
   <parent>
     <groupId>com.xliic.openapi</groupId>
     <artifactId>openapi-parent</artifactId>
-    <version>1.0.53</version>
+    <version>1.0.54</version>
   </parent>
 
   <artifactId>openapi-plugin</artifactId>

openapi-plugin/plugin.xml

@@ -99,7 +99,7 @@ public LogicalPosition offsetToLogicalPosition(int offset) {
 
     public IAnnotationModel getModel() {
         ITextEditor editor = getTextEditor();
-        return editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput());
+        return editor == null ? null : editor.getDocumentProvider().getAnnotationModel(editor.getEditorInput());
     }
 
     public ISourceViewer getSourceViewer() {

openapi-plugin/pom.xml

@@ -70,4 +70,14 @@ public IEditorInput getEditorInput(@NotNull Document document) {
         }
         return null;
     }
+
+    @Nullable
+    public IEditorInput getEditorInput(@NotNull VirtualFile file) {
+        for (IEditorInput input : EclipseUtil.getAllSupportedEditorInputs()) {
+            if (file.equals(EclipseUtil.getVirtualFile(input))) {
+                return input;
+            }
+        }
+        return null;
+    }
 }

openapi-plugin/src/main/java/com/xliic/core/editor/Editor.java

@@ -1,7 +1,6 @@
 package com.xliic.core.psi;
 
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import com.xliic.core.project.Project;
 import com.xliic.core.vfs.VirtualFile;
@@ -22,7 +21,7 @@ public static PsiManager getInstance(@NotNull Project project) {
         return psiManager;
     }
 
-    @Nullable
+    @NotNull
     public PsiFile findFile(@NotNull VirtualFile file) {
         return new PsiFile(project, file);
     }

openapi-plugin/src/main/java/com/xliic/core/fileEditor/FileDocumentManager.java

@@ -45,6 +45,7 @@
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
+import com.xliic.core.fileEditor.FileDocumentManager;
 import com.xliic.core.vfs.VirtualFile;
 import com.xliic.openapi.parser.ast.Range;
 import com.xliic.openapi.parser.ast.node.Node;
@@ -79,6 +80,15 @@ public static ISourceViewer getSourceViewer(@NotNull IEditorInput input) {
         return null;
     }
 
+    @Nullable
+    public static ISourceViewer getSourceViewer(@NotNull VirtualFile file) {
+        IEditorInput input = FileDocumentManager.getInstance().getEditorInput(file);
+        if (input == null) {
+            return null;
+        }
+        return getSourceViewer(input);
+    }
+
     @Nullable
     public static ITextEditor getTextEditor(@NotNull IEditorInput input) {
         IWorkbench workbench = PlatformUI.getWorkbench();

openapi-plugin/src/main/java/com/xliic/core/psi/PsiManager.java

@@ -0,0 +1,33 @@
+package com.xliic.openapi;
+
+import java.util.LinkedList;
+import java.util.List;
+
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import com.xliic.openapi.parser.ast.node.Node;
+
+public abstract class DfsHandler<T> {
+
+    @NotNull
+    protected String fileName = "";
+    @Nullable
+    protected OpenApiVersion version = null;
+    @NotNull
+    protected final List<T> data = new LinkedList<>();
+
+    public void init(@NotNull String fileName, @Nullable OpenApiVersion version) {
+        this.fileName = fileName;
+        this.version = version;
+        data.clear();
+    }
+
+    public abstract boolean visit(@NotNull Node node);
+
+    public abstract void finish(boolean success);
+
+    protected boolean isOpenAPI() {
+        return version == OpenApiVersion.V2 || version == OpenApiVersion.V3;
+    }
+}

openapi-plugin/src/main/java/com/xliic/core/util/EclipseUtil.java

@@ -49,9 +49,11 @@ public class OpenAPIImages {
 
     public static final ImageDescriptor TryIt;
     public static final ImageDescriptor TryItPanel;
+    public static final ImageDescriptor TryItAnno;
 
     public static final ImageDescriptor Scan;
     public static final ImageDescriptor ScanPanel;
+    public static final ImageDescriptor ScanAnno;
 
     public static final ImageDescriptor EnvPanel;
 
@@ -104,8 +106,10 @@ public class OpenAPIImages {
 
         TryIt = createImageDescriptor("/icons/tryit.png");
         TryItPanel = createImageDescriptor("/icons/tryitPanel.png");
+        TryItAnno = createImageDescriptor("/icons/tryitAnno.png");
         Scan = createImageDescriptor("/icons/scan.png");
         ScanPanel = createImageDescriptor("/icons/scanPanel.png");
+        ScanAnno = createImageDescriptor("/icons/scanAnno.png");
         EnvPanel = createImageDescriptor("/icons/envPanel.png");
         Config = createImageDescriptor("/icons/config.png");
         ConfigPanel = createImageDescriptor("/icons/configPanel.png");

openapi-plugin/src/main/java/com/xliic/openapi/DfsHandler.java

@@ -6,6 +6,7 @@
 import com.xliic.core.project.Project;
 import com.xliic.core.startup.StartupActivity;
 import com.xliic.openapi.environment.EnvService;
+import com.xliic.openapi.inlined.AnnotationService;
 import com.xliic.openapi.platform.PlatformConnection;
 import com.xliic.openapi.services.AuditService;
 import com.xliic.openapi.services.DictionaryService;
@@ -32,6 +33,7 @@ public void runActivity(@NotNull Project project) {
         DictionaryService.getInstance(project).subscribe();
         ScanService.getInstance(project).subscribe();
         EnvService.getInstance(project).subscribe();
+        AnnotationService.getInstance(project).subscribe();
         // Platform
         PlatformService platformService = PlatformService.getInstance(project);
         if (PlatformConnection.isPlatformIntegrationEnabled()) {

openapi-plugin/src/main/java/com/xliic/openapi/OpenAPIImages.java

@@ -20,6 +20,9 @@
 import com.xliic.core.ide.util.PropertiesComponent;
 import com.xliic.core.project.Project;
 import com.xliic.openapi.SecurityPropertiesComponent;
+import com.xliic.openapi.platform.PlatformConnection;
+import com.xliic.openapi.settings.Settings;
+import com.xliic.openapi.settings.Settings.Platform;
 import com.xliic.openapi.settings.Settings.Platform.Scan.ScandMgr;
 import com.xliic.openapi.topic.SettingsListener;
 import com.xliic.openapi.utils.Utils;
@@ -78,6 +81,7 @@ public void run(@Nullable Object payload) {
                 }
             }
             if (!updatedKeys.isEmpty() && !project.isDisposed()) {
+                addPlatformTurnOnOffKeys(updatedKeys, prevData);
                 project.getMessageBus().syncPublisher(SettingsListener.TOPIC).propertiesUpdated(updatedKeys, prevData);
             }
         }
@@ -111,4 +115,23 @@ private void updateByKeyIfNotEqual(String key, Object value, Object newValue, bo
             prevData.put(key, value);
         }
     }
+
+    private void addPlatformTurnOnOffKeys(Set<String> updatedKeys, Map<String, Object> prevData) {
+        final String prevApiKey = (String) prevData.get(Settings.Platform.Credentials.API_KEY);
+        boolean wasPltEnabled = !prevApiKey.isEmpty();
+        boolean nowPltEnabled = PlatformConnection.isPlatformIntegrationEnabled();
+        if (nowPltEnabled && !wasPltEnabled) {
+            updatedKeys.add(Platform.TURNED_ON);
+            return;
+        }
+        if (!nowPltEnabled && wasPltEnabled) {
+            updatedKeys.add(Platform.TURNED_OFF);
+            return;
+        }
+    }
 }
+
+
+
+
+

openapi-plugin/src/main/java/com/xliic/openapi/OpenAPIStartupActivity.java

@@ -0,0 +1,22 @@
+package com.xliic.openapi.inlined;
+
+import org.eclipse.jface.text.source.Annotation;
+import org.eclipse.jface.text.source.IAnnotationAccess;
+
+public class AnnotationAccess implements IAnnotationAccess {
+
+    @Override
+    public Object getType(Annotation annotation) {
+        return annotation.getType();
+    }
+
+    @Override
+    public boolean isMultiLine(Annotation annotation) {
+        return true;
+    }
+
+    @Override
+    public boolean isTemporary(Annotation annotation) {
+        return true;
+    }
+}