Fixes for VSCode OpenTextDocument uri

SteveCurran · Mar 10, 2017 · 271144f · 271144f
1 parent bfa559b
commit 271144f
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 15 deletions.
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "spremoteapi",
     "displayName": "SPRemoteAPI",
     "description": "VSCode extension for SharePoint Office 365 REST and JavaScript API Discovery",
-    "version": "1.5.1",
+    "version": "1.5.2",
     "publisher": "SteveCurran",
     "author": {
         "name": "Steve Curran - MVP"

diff --git a/spremoteapi-1.5.2.vsix b/spremoteapi-1.5.2.vsix
diff --git a/src/extension.ts b/src/extension.ts
@@ -27,7 +27,7 @@ export function activate(context: vscode.ExtensionContext) {
 
     vscode.workspace.registerTextDocumentContentProvider("spremotescheme",
         {provideTextDocumentContent(uri){
-            var typeName = uri.authority;
+            var typeName = uri.query;
             var memberType = uri.fsPath.substring(uri.fsPath.indexOf('\\')+1,uri.fsPath.lastIndexOf('\\'));
             var opName = uri.fsPath.substring(uri.fsPath.lastIndexOf('\\')+1,(uri.fsPath.length-5));
 
@@ -106,8 +106,7 @@ export function typeSelectOptionHandler(type){
                     if(val){
                         let vval:any = val;
                         let methodName = vval.label.startsWith("$(octicon octicon-flame)") ? vval.label.substr(24) : vval.label;
-                        let uri = vscode.Uri.parse('spremotescheme://' + itemName + '/method/'+ methodName + ".json");
-
+                        let uri = vscode.Uri.parse('spremotescheme://remote/method/'+ methodName + ".json?" + itemName);
                         vscode.workspace.openTextDocument(uri).then(doc=>{
                             vscode.window.showTextDocument(doc,vscode.ViewColumn.Two,true);
                             return;
@@ -120,15 +119,15 @@ export function typeSelectOptionHandler(type){
 
                 if(option.title.startsWith("Properties"))
                 {
-                    let uri = vscode.Uri.parse('spremotescheme://' + itemName + '/properties/properties.json');
+                    let uri = vscode.Uri.parse('spremotescheme://remote/properties/properties.json?' + itemName);
 
                     vscode.workspace.openTextDocument(uri).then(doc=>{
                         vscode.window.showTextDocument(doc,vscode.ViewColumn.Two);  
                         return;
                     });                      
                 }
                 else{
-                    let uri = vscode.Uri.parse('spremotescheme://' + itemName + '/interface/' + itemName + '.d.ts');
+                    let uri = vscode.Uri.parse('spremotescheme://remote/interface/' + itemName + '.d.ts?' + itemName);
 
                     vscode.workspace.openTextDocument(uri).then(doc=>{
                         vscode.window.showTextDocument(doc,vscode.ViewColumn.Two);  

diff --git a/src/services/contentProvider.ts b/src/services/contentProvider.ts
@@ -60,9 +60,9 @@ export class metadataContentProvider{
 
                 if(response.type){
                     let rt = ds.findType(response.type);
-                    if(!rt)
+                    if(!rt && method.Response.Metadata.TargetType)
                         rt = ds.findType(method.Response.Metadata.TargetType);
-                    if(!rt)
+                    if(!rt && method.Response.Metadata.ServerType )
                         rt = ds.findType(method.Response.Metadata.ServerType);
 
                     if(rt)
@@ -97,6 +97,8 @@ export class metadataContentProvider{
         propertyContent.name = type;
 
         if(rt){
+            //type is lower case version of name of type change to use remote type's propercase
+            propertyContent.name = rt.Name;
             if(rt.Properties){
                 for(let prop in rt.Properties){
                     let tprop:any = rt.Properties[prop]

diff --git a/src/services/remoteApiMetadata.ts b/src/services/remoteApiMetadata.ts
@@ -86,7 +86,7 @@ public findTypeInfo = (typeName:string) =>{
     var typeInfo = {methodCount:0, propertyCount:0};
     if(remotes){
        var item = remotes.find(function(item:any){
-            return item.Name == typeName;
+            return item.Name.toLowerCase() == typeName.toLowerCase();
         });
 
         if(item){
@@ -109,7 +109,7 @@ public findType = (typeName:string) =>{
 
     if(remotes){
         item = remotes.find(function(item:any){
-            return item.Name == typeName;
+            return item.Name.toLowerCase() == typeName.toLowerCase();
         });
     }
 
@@ -123,7 +123,7 @@ public findExternalType = (typeName:string) =>{
 
     if(externals){
         item = externals.find(function(item:any){
-            return item.Name == typeName;
+            return item.Name.toLowerCase() == typeName.toLowerCase();
         });
     }
 
@@ -137,7 +137,7 @@ public findMethods = (remoteName) =>{
 
     if(remotes){
        var item = remotes.find(function(item:any){
-            return item.Name == remoteName;
+            return item.Name.toLowerCase() == remoteName.toLowerCase();
         });
 
         if(item){
@@ -161,13 +161,13 @@ public findMethod = (remoteName:string, methodName:string) =>{
     var remoteMethod;
     if(remotes){
        var item = remotes.find(function(item:any){
-            return item.Name == remoteName;
+            return item.Name.toLowerCase() == remoteName.toLowerCase();
         });
 
         if(item){
             if(item.Methods){
                var method = item.Methods.find(function(m:any){
-                   return m.Name == methodName;
+                   return m.Name.toLowerCase() == methodName.toLowerCase();
                });
                remoteMethod = method;
             }
@@ -184,7 +184,7 @@ public findProperties = (remoteName) =>{
 
     if(remotes){
        var item = remotes.find(function(item:any){
-            return item.Name == remoteName;
+            return item.Name.toLowerCase() == remoteName.toLowerCase();
         });
 
         if(item){