Skip to content

Commit

Permalink
merge
Browse files Browse the repository at this point in the history
  • Loading branch information
Shan Khan authored and Shan Khan committed Sep 19, 2016
2 parents a172880 + f55e607 commit f5e386f
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 6 deletions.
14 changes: 9 additions & 5 deletions src/commons.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import {Environment} from './environmentPath';
import {File, FileManager} from './fileManager';
import {LocalSetting} from './setting';
import {PluginService, ExtensionInformation} from './pluginService';
import * as fs from 'fs';

var isOnline = require('is-online');

Expand Down Expand Up @@ -218,13 +219,15 @@ export class Commons {
var addedExtension: string = "\r\nEXTENSIONS ADDED : \r\n";
var tempURI: string = this.en.APP_SUMMARY;

while (tempURI.indexOf("/") > -1) {
tempURI = tempURI.replace("/", "\\");
}

console.log("FILE URI For Summary Page : " + tempURI);
<<<<<<< HEAD

var setting: vscode.Uri = vscode.Uri.parse("untitled:" + tempURI);
=======

var setting: vscode.Uri = vscode.Uri.file(tempURI);
fs.openSync(setting.fsPath, 'w');
>>>>>>> f55e607c3ddf5b77e5d4ce7d7e8de77650d7d261

vscode.workspace.openTextDocument(setting).then((a: vscode.TextDocument) => {

Expand Down Expand Up @@ -279,7 +282,8 @@ export class Commons {
}
}
});
});
e.document.save();
});
}, (error: any) => {
console.error(error);
return;
Expand Down
2 changes: 1 addition & 1 deletion src/environmentPath.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ export class Environment {

public FOLDER_SNIPPETS: string = null;
public APP_SETTINGS : string = null;
public APP_SUMMARY_NAME : string = "summary.txt";
public APP_SUMMARY_NAME : string = "syncSummary.txt";
public APP_SUMMARY : string = null;

constructor(context: vscode.ExtensionContext) {
Expand Down

0 comments on commit f5e386f

Please sign in to comment.