keybindings file variable swapped and other fixes

killers525 · Aug 26, 2016 · 9cb3960 · 9cb3960
1 parent eed7359
commit 9cb3960
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 15 deletions.
diff --git a/src/extension.ts b/src/extension.ts
@@ -147,14 +147,7 @@ export async function activate(context: vscode.ExtensionContext) {
                 vscode.window.setStatusBarMessage("Sync : Reading Settings and Extensions.", 1000);
 
                 var settingFile: File = await FileManager.GetFile(en.FILE_SETTING, en.FILE_SETTING_NAME);
-                var launchFile: File = await FileManager.GetFile(en.FILE_LAUNCH, en.FILE_SETTING_NAME);
-                var keybindingFile: File = await FileManager.GetFile(en.FILE_KEYBINDING, en.FILE_SETTING_NAME);
-                var localeFile: File = await FileManager.GetFile(en.FILE_LOCALE, en.FILE_SETTING_NAME);
-
-                allSettingFiles.push(settingFile);
-                allSettingFiles.push(launchFile);
-                allSettingFiles.push(keybindingFile);
-                allSettingFiles.push(localeFile);
+                var launchFile: File = await FileManager.GetFile(en.FILE_LAUNCH, en.FILE_LAUNCH_NAME);
 
                 var destinationKeyBinding: string = "";
                 if (en.OsType == OsType.Mac) {
@@ -163,6 +156,16 @@ export async function activate(context: vscode.ExtensionContext) {
                 else {
                     destinationKeyBinding = en.FILE_KEYBINDING_DEFAULT;
                 }
+
+                var keybindingFile: File = await FileManager.GetFile(en.FILE_KEYBINDING, destinationKeyBinding);
+                var localeFile: File = await FileManager.GetFile(en.FILE_LOCALE, en.FILE_LOCALE_NAME);
+
+                allSettingFiles.push(settingFile);
+                allSettingFiles.push(launchFile);
+                allSettingFiles.push(keybindingFile);
+                allSettingFiles.push(localeFile);
+
+
 
                 var extensionlist = PluginService.CreateExtensionList();
                 extensionlist.sort(function (a, b) {
@@ -440,7 +443,7 @@ export async function activate(context: vscode.ExtensionContext) {
                                 break;
                             }
                             default: {
-                                if (i < keys.length) {
+                                if (i < keys.length && keys[i].indexOf("keybinding")==-1) {
                                     if (keys[i].indexOf(".") > -1) {
                                         await FileManager.CreateDirectory(en.FOLDER_SNIPPETS);
                                         var file = en.FOLDER_SNIPPETS.concat(keys[i]);//.concat(".json");

diff --git a/src/fileManager.ts b/src/fileManager.ts
@@ -2,10 +2,10 @@
 var fs = require('fs');
 
 export class File {
-    public fileName: string = null;
-    constructor(private file: string, public content: string, private filePath) {
+
+    constructor(public fileName: string, public content: string, private filePath) {
         // this.fileName = file.split('.')[0];
-        this.fileName = file;
+        //this.fileName = file;
     }
 }
 export class FileManager {

diff --git a/src/githubService.ts b/src/githubService.ts
@@ -110,9 +110,9 @@ export class GithubService {
         var allFiles: string[] = Object.keys(gistObject.files);
         for (var fileIndex = 0; fileIndex < allFiles.length; fileIndex++) {
             var fileName = allFiles[fileIndex];
-            if (fileName.indexOf(".") < 0) {
-                gistObject.files[fileName] = null;
-            }
+            // if (fileName.indexOf(".") < 0) {
+            //     gistObject.files[fileName] = null;
+            // }
             var exists = false;
 
             files.forEach((settingFile) => {