Merge pull request #27 from uctakeoff/develop

ver.1.3.5

.gitignore

@@ -1,4 +1,5 @@
 out
 node_modules
 .vscode-test/
+.VSCodeCounter/
 *.vsix

.vscodeignore

@@ -1,5 +1,6 @@
 .vscode/**
 .vscode-test/**
+.VSCodeCounter/**
 out/test/**
 src/**
 .gitignore
@@ -8,4 +9,5 @@ vsc-extension-quickstart.md
 **/tslint.json
 **/*.map
 **/*.ts
-work/**
+work/**
+images/**

CHANGELOG.md

@@ -7,6 +7,18 @@ Check [Keep a Changelog](http://keepachangelog.com/) for recommendations on how
 
 * workspace counter in status bar.
 
+## [1.3.5]
+
+### Fixed
+
+- Issue : `CSV could be more strictly formed`.
+
+## [1.3.4]
+
+### Fixed
+
+- Issue : `Handling symlinks`.
+
 ## [1.3.3]
 
 ### Added

package.json

@@ -2,7 +2,7 @@
   "name": "vscode-counter",
   "displayName": "VS Code Counter",
   "description": "Count lines of code in many programming languages.",
-  "version": "1.3.3",
+  "version": "1.3.5",
   "publisher": "uctakeoff",
   "author": {
     "name": "Ushiyama Kentaro"
@@ -15,7 +15,7 @@
     "theme": "dark"
   },
   "license": "SEE LICENSE IN LICENSE.txt",
-  "icon": "images/icon.png",
+  "icon": "icon.png",
   "homepage": "https://github.com/uctakeoff/vscode-counter",
   "repository": {
     "type": "git",
@@ -45,25 +45,25 @@
         "command": "extension.vscode-counter.countInFile",
         "category": "VSCodeCounter",
         "title": "%commands.countInFile.title%",
-        "icon": "images/icon.png"
+        "icon": "icon.png"
       },
       {
         "command": "extension.vscode-counter.countInDirectory",
         "category": "VSCodeCounter",
         "title": "%commands.countInDirectory.title%",
-        "icon": "images/icon.png"
+        "icon": "icon.png"
       },
       {
         "command": "extension.vscode-counter.countInWorkspace",
         "category": "VSCodeCounter",
         "title": "%commands.countInWorkspace.title%",
-        "icon": "images/icon.png"
+        "icon": "icon.png"
       },
       {
         "command": "extension.vscode-counter.outputAvailableLanguages",
         "category": "VSCodeCounter",
         "title": "%commands.outputAvailableLanguages.title%",
-        "icon": "images/icon.png"
+        "icon": "icon.png"
       }
     ],
     "menus": {
@@ -263,7 +263,6 @@
     "vscode-test": "^1.2.2"
   },
   "dependencies": {
-    "graceful-fs": "^4.2.3",
     "jsonc-parser": "^2.2.0",
     "minimatch": "^3.0.4"
   }

src/extension.ts

@@ -52,7 +52,7 @@ export function activate(context: vscode.ExtensionContext) {
 export function deactivate() {
 }
 
-const workspaceFolders = (): vscode.WorkspaceFolder[] => {
+const workspaceFolders = (): readonly vscode.WorkspaceFolder[] => {
     const folders = vscode.workspace.workspaceFolders;
     return !folders ? [] : folders;
 };
@@ -706,6 +706,7 @@ class ResultTable {
             this.total.append(result);
         });
     }
+/*
     public toCSVLines() {
         const languages = [...this.langResultTable.keys()];
         return [
@@ -715,6 +716,16 @@ class ResultTable {
             `Total, -, ${[...this.langResultTable.values()].map(r => r.code).join(', ')}, ${this.total.comment}, ${this.total.blank}, ${this.total.total}`
         ];
     }
+*/
+    public toCSVLines() {
+        const languages = [...this.langResultTable.keys()];
+        return [
+            `"filename", "language", "${languages.join('", "')}", "comment", "blank", "total"`,
+            ...this.fileResults.sort((a,b) => a.filename < b.filename ? -1 : a.filename > b.filename ? 1 : 0)
+                .map(v => `"${v.filename}", "${v.language}", ${languages.map(l => l === v.language ? v.code : 0).join(', ')}, ${v.comment}, ${v.blank}, ${v.total}`),
+            `"Total", "-", ${[...this.langResultTable.values()].map(r => r.code).join(', ')}, ${this.total.comment}, ${this.total.blank}, ${this.total.total}`
+        ];
+    }
     public toTextLines() {
         class TextTableFormatter {
             private valueToString: (obj:any) => string;
@@ -889,18 +900,20 @@ function writeTextFile(outputFilename: string, text: string) {
 }
 */
 function makeDirectories_(dirpath: vscode.Uri, resolve: ()=> void, reject: (reason: string) => void) {
-    console.log(`makeDirectories ${dirpath}`);
+    // log(`makeDirectories ${dirpath}`);
     vscode.workspace.fs.stat(dirpath).then((value) => {
-        if (value.type === vscode.FileType.Directory) {
+        if (value.type !== vscode.FileType.File) {
             resolve();
         } else {
             reject(`${dirpath} is not directory.`);
         }
     }, (reason) => {
+        log(`vscode.workspace.fs.stat failed: ${reason}`);
         const curPath = dirpath.path;
         const parent = path.dirname(curPath);
         if (parent !== curPath) {
             makeDirectories_(dirpath.with({path: parent}), () => {
+                log(`vscode.workspace.fs.createDirectory ${dirpath}`);
                 vscode.workspace.fs.createDirectory(dirpath).then(resolve, reject);
             }, reject);
         } else {