go to realfile if exists

Author: daimor

Diff for: CHANGELOG.md

@@ -9,6 +9,7 @@
 - Show percent-member in outline
 - Multi-root workspace supported now, for different connections
 - Multi-root workspace also for server explorer
+- Go to definition now goes to real file if such presented, or opens from the server
 
 ## [0.7.7]
 

Diff for: api/index.ts

@@ -1,9 +1,7 @@
 import * as httpModule from 'http';
 import * as httpsModule from 'https';
-import * as vscode from 'vscode';
-import { outputConsole, outputChannel } from '../utils';
-import { config, currentWorkspaceFolder } from '../extension';
-import { type } from 'os';
+import { outputConsole, currentWorkspaceFolder } from '../utils';
+import { config } from '../extension';
 
 export class AtelierAPI {
   private cookies: string[] = [];

Diff for: extension.ts

@@ -20,7 +20,7 @@ import { DocumentContentProvider } from './providers/DocumentContentProvider';
 import { XmlContentProvider } from './providers/XmlContentProvider';
 
 import { ObjectScriptExplorerProvider } from './explorer/explorer';
-import { outputChannel, outputConsole } from './utils';
+import { outputChannel, currentWorkspaceFolder } from './utils';
 import { AtelierAPI } from './api';
 export var explorerProvider: ObjectScriptExplorerProvider;
 export var documentContentProvider: DocumentContentProvider;
@@ -53,19 +53,6 @@ export function getXmlUri(uri: vscode.Uri): vscode.Uri {
   });
 }
 
-export function currentWorkspaceFolder(): string {
-  let workspaceFolder;
-  if (vscode.window.activeTextEditor && vscode.window.activeTextEditor.document) {
-    const uri = vscode.window.activeTextEditor.document.uri;
-    if (uri.scheme === 'file') {
-      workspaceFolder = vscode.workspace.getWorkspaceFolder(uri).name;
-    } else if (uri.scheme.startsWith('objectscript')) {
-      workspaceFolder = uri.authority;
-    }
-  }
-  return workspaceFolder || workspaceState.get<string>('workspaceFolder');
-}
-
 export async function activate(context: vscode.ExtensionContext): Promise<void> {
   const languages = require(context.asAbsolutePath('./package.json'))['contributes']['languages'].map(lang => lang.id);
   workspaceState = context.workspaceState;

Diff for: package-lock.json

@@ -420,5 +420,7 @@
     "vsce": "^1.53.2",
     "vscode": "^1.1.26"
   },
-  "dependencies": {}
+  "dependencies": {
+    "glob": "^7.1.3"
+  }
 }

Diff for: package.json

@@ -1,16 +1,31 @@
 import * as vscode from 'vscode';
 import { AtelierAPI } from './../api';
+import * as glob from 'glob';
+import * as url from 'url';
 
-import { OBJECTSCRIPT_FILE_SCHEMA, workspaceState, currentWorkspaceFolder } from '../extension';
-const url = require('url');
+import { OBJECTSCRIPT_FILE_SCHEMA } from '../extension';
+import { currentWorkspaceFolder, workspaceFolderUri } from '../utils';
 
 export class DocumentContentProvider implements vscode.TextDocumentContentProvider {
   private onDidChangeEvent: vscode.EventEmitter<vscode.Uri> = new vscode.EventEmitter<vscode.Uri>();
 
   constructor() {}
 
+  static findAsFile(name: string, workspaceFolder: string) {
+    let fileName = name.split('.');
+    let fileExt = fileName.pop().toLowerCase();
+    let root = workspaceFolderUri(workspaceFolder).path;
+    let pattern = `/**/{${fileName.join('.')},${fileName.join('/')}}.${fileExt}`;
+    let found = glob.sync(pattern, { root, nodir: true });
+    return found.length ? found.pop() : null;
+  }
+
   public static getUri(name: string, workspaceFolder?: string, namespace?: string): vscode.Uri {
     workspaceFolder = workspaceFolder && workspaceFolder !== '' ? workspaceFolder : currentWorkspaceFolder();
+    let found = this.findAsFile(name, workspaceFolder);
+    if (found) {
+      return vscode.Uri.file(found);
+    }
     let uri = vscode.Uri.file(name).with({
       scheme: OBJECTSCRIPT_FILE_SCHEMA
     });
@@ -35,7 +50,8 @@ export class DocumentContentProvider implements vscode.TextDocumentContentProvid
     let query = url.parse(decodeURIComponent(uri.toString()), true).query;
     if (query) {
       if (query.ns && query.ns !== '') {
-        api.setNamespace(query.ns);
+        let namespace = query.ns.toString();
+        api.setNamespace(namespace);
       }
     }
     api.setConnection(uri.authority);

Diff for: providers/DocumentContentProvider.ts

@@ -1,6 +1,7 @@
 import * as vscode from 'vscode';
 import fs = require('fs');
 import path = require('path');
+import { workspaceState } from '../extension';
 
 export const outputChannel = vscode.window.createOutputChannel('ObjectScript');
 
@@ -69,3 +70,20 @@ export async function mkdirSyncRecursive(dirpath: string): Promise<string> {
     }
   });
 }
+
+export function currentWorkspaceFolder(): string {
+  let workspaceFolder;
+  if (vscode.window.activeTextEditor && vscode.window.activeTextEditor.document) {
+    const uri = vscode.window.activeTextEditor.document.uri;
+    if (uri.scheme === 'file') {
+      workspaceFolder = vscode.workspace.getWorkspaceFolder(uri).name;
+    } else if (uri.scheme.startsWith('objectscript')) {
+      workspaceFolder = uri.authority;
+    }
+  }
+  return workspaceFolder || workspaceState.get<string>('workspaceFolder');
+}
+
+export function workspaceFolderUri(workspaceFolder: string): vscode.Uri {
+  return vscode.workspace.workspaceFolders.find(el => el.name === workspaceFolder).uri;
+}