Merge branch 'master' into #165-explorer_show_system

Author: rajrsingh

.vscode/tasks.json

@@ -21,7 +21,7 @@
         "kind": "build"
       },
       "isBackground": true,
-      "problemMatcher": "$tsc-watch"
+      "problemMatcher": "$eslint-stylish"
     }
   ]
 }

src/debug/debugAdapterFactory.ts

@@ -2,7 +2,8 @@ import net = require("net");
 import vscode = require("vscode");
 import { ObjectScriptDebugSession } from "./debugSession";
 
-export class ObjectScriptDebugAdapterDescriptorFactory implements vscode.DebugAdapterDescriptorFactory {
+export class ObjectScriptDebugAdapterDescriptorFactory
+  implements vscode.DebugAdapterDescriptorFactory, vscode.Disposable {
   private server?: net.Server;
 
   public createDebugAdapterDescriptor(
@@ -26,7 +27,7 @@ export class ObjectScriptDebugAdapterDescriptorFactory implements vscode.DebugAd
     return new vscode.DebugAdapterServer(port);
   }
 
-  public dispose() {
+  public dispose(): void {
     if (this.server) {
       this.server.close();
     }

src/explorer/models/nodeBase.ts

@@ -46,7 +46,7 @@ export class NodeBase {
     };
   }
 
-  public async getChildren(element): Promise<NodeBase[]> {
+  public async getChildren(element: NodeBase): Promise<NodeBase[]> {
     return [];
   }
 

src/explorer/models/packageNode.ts

@@ -1,8 +1,9 @@
 import * as vscode from "vscode";
 import { RootNode } from "./rootNode";
+import { NodeOptions } from "./nodeBase";
 
 export class PackageNode extends RootNode {
-  public constructor(label: string, fullName: string, category: string, options) {
+  public constructor(label: string, fullName: string, category: string, options: NodeOptions) {
     super(label, fullName, "dataNode:packageNode", category, options);
   }
 

src/explorer/models/rootNode.ts

@@ -5,6 +5,7 @@ import { PackageNode } from "./packageNode";
 import { RoutineNode } from "./routineNode";
 import { AtelierAPI } from "../../api";
 import { ClassNode } from "./classesNode";
+import { StudioOpenDialog } from "../../queries";
 
 export class RootNode extends NodeBase {
   public readonly contextValue: string;
@@ -37,12 +38,12 @@ export class RootNode extends NodeBase {
     };
   }
 
-  public async getChildren(element): Promise<NodeBase[]> {
+  public async getChildren(element: NodeBase): Promise<NodeBase[]> {
     const path = this instanceof PackageNode || this.isCsp ? this.fullName + "/" : "";
     return this.getItems(path, this._category);
   }
 
-  public getList(path: string, category: string, flat: boolean) {
+  public getList(path: string, category: string, flat: boolean): Promise<(StudioOpenDialog & { fullName: string })[]> {
     const sql = "CALL %Library.RoutineMgr_StudioOpenDialog(?,?,?,?,?,?,?)";
     // const sql = "CALL %Library.RoutineMgr_StudioOpenDialog(?,,,,,,?)";
     let spec = "";
@@ -86,7 +87,7 @@ export class RootNode extends NodeBase {
         return content;
       })
       .then((data) =>
-        data.map((el) => {
+        data.map((el: StudioOpenDialog) => {
           let fullName = el.Name;
           if (this instanceof PackageNode) {
             fullName = this.fullName + "." + el.Name;

src/providers/FileSystemPovider/FileSystemProvider.ts

@@ -4,6 +4,8 @@ import * as url from "url";
 import { AtelierAPI } from "../../api";
 import { Directory } from "./Directory";
 import { File } from "./File";
+import { fireOtherStudioAction, OtherStudioAction } from "../../commands/studio";
+import { StudioOpenDialog } from "../../queries";
 
 export type Entry = File | Directory;
 
@@ -55,7 +57,7 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
       .actionQuery(sql, [spec, dir, orderBy, system, flat, notStudio, generated])
       .then((data) => data.result.content || [])
       .then((data) =>
-        data.map((item) => {
+        data.map((item: StudioOpenDialog) => {
           const name = item.Name;
           const fullName = folder === "" ? name : folder + "/" + name;
           if (item.Type === "10" || item.Type === "9") {
@@ -151,11 +153,15 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
           throw new Error("Not implemented");
         }
       })
-      .then(() =>
+      .then((response) => {
+        if (response && response.result.ext && response.result.ext[0] && response.result.ext[1]) {
+          fireOtherStudioAction(OtherStudioAction.CreatedNewDocument, uri, response.result.ext[0]);
+          fireOtherStudioAction(OtherStudioAction.FirstTimeDocumentSave, uri, response.result.ext[1]);
+        }
         this._lookupAsFile(uri).then((entry) => {
           this._fireSoon({ type: vscode.FileChangeType.Changed, uri });
-        })
-      );
+        });
+      });
   }
 
   public delete(uri: vscode.Uri, options: { recursive: boolean }): void | Thenable<void> {
@@ -166,7 +172,12 @@ export class FileSystemProvider implements vscode.FileSystemProvider {
       return;
     }
     const api = new AtelierAPI(uri);
-    return api.deleteDoc(fileName).then(() => this._fireSoon({ type: vscode.FileChangeType.Deleted, uri }));
+    return api.deleteDoc(fileName).then((response) => {
+      if (response.result.ext) {
+        fireOtherStudioAction(OtherStudioAction.DeletedDocument, uri, response.result.ext);
+      }
+      this._fireSoon({ type: vscode.FileChangeType.Deleted, uri });
+    });
   }
 
   public rename(oldUri: vscode.Uri, newUri: vscode.Uri, options: { overwrite: boolean }): void | Thenable<void> {

src/providers/ObjectScriptCompletionItemProvider.ts

@@ -203,7 +203,7 @@ export class ObjectScriptCompletionItemProvider implements vscode.CompletionItem
       });
   }
 
-  public listSystemVariables(search: string) {
+  public listSystemVariables(search: string): vscode.CompletionItem[] {
     return systemVariables
       .filter((el) => el.label.startsWith(search) || el.alias.findIndex((el2) => el2.startsWith(search)) >= 0)
       .map((el) => {
@@ -217,7 +217,7 @@ export class ObjectScriptCompletionItemProvider implements vscode.CompletionItem
       });
   }
 
-  public listStructuredSystemVariables(search: string, open = false) {
+  public listStructuredSystemVariables(search: string, open = false): vscode.CompletionItem[] {
     return structuredSystemVariables.map((el) => {
       return {
         ...el,
@@ -436,7 +436,7 @@ export class ObjectScriptCompletionItemProvider implements vscode.CompletionItem
     position: vscode.Position,
     token: vscode.CancellationToken,
     context: vscode.CompletionContext
-  ) {
+  ): vscode.ProviderResult<vscode.CompletionItem[] | vscode.CompletionList> {
     const range = document.getWordRangeAtPosition(position, /\$system(\.\b\w+\b)?(\.\b\w+\b)?\./i);
     const text = range ? document.getText(range) : "";
     const [, className] = text.match(/\$system(\.\b\w+\b)?(\.\b\w+\b)?\./i);

src/providers/WorkspaceSymbolProvider.ts

@@ -2,6 +2,7 @@ import * as vscode from "vscode";
 import { AtelierAPI } from "../api";
 import { ClassDefinition } from "../utils/classDefinition";
 import { DocumentContentProvider } from "./DocumentContentProvider";
+import { StudioOpenDialog } from "../queries";
 
 export class WorkspaceSymbolProvider implements vscode.WorkspaceSymbolProvider {
   public provideWorkspaceSymbols(
@@ -48,7 +49,7 @@ export class WorkspaceSymbolProvider implements vscode.WorkspaceSymbolProvider {
     const generated = "0";
 
     const data = await api.actionQuery(sql, [query, direction, orderBy, systemFiles, flat, notStudio, generated]);
-    return data.result.content.map(({ Name }) => ({
+    return data.result.content.map(({ Name }: StudioOpenDialog) => ({
       kind: vscode.SymbolKind.File,
       location: {
         uri: DocumentContentProvider.getUri(Name),

src/queries.d.ts

@@ -0,0 +1,9 @@
+export interface StudioOpenDialog {
+  Name: string;
+  IsDirectory: string;
+  Type: string;
+  Size: string;
+  Date: string;
+  Description: string;
+  IconType: string;
+}