Fixed CSV editing bugs.

jjuback · Jun 13, 2022 · 7592049 · 7592049
1 parent c30fbb9
commit 7592049
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log
 
+## 4.2.55 (June 13, 2022)
+Fixed issue with CSV editing where text pasted into a cell was ignored when saving the file.
+
+Fixed issue with CSV editing where changing a value in the rightmost cell could result in extra line breaks and/or misaligned cells when saving the file.
+
+Fixed issue where a line number was displayed instead of the `*` character in the AddNew row.
+
 ## 4.2.54 (March 29, 2022)
 Fixed problems with CSV editing when the `csv-preview.separator` configuration setting was set to a regular expression instead of a single character.
 

diff --git a/out/csv.js b/out/csv.js
@@ -125,14 +125,16 @@ function initPage() {
 
     flex.formatItem.addHandler(function(s, e) {
         if (lineNumbers) {
-           if (e.panel.cellType == wijmo.grid.CellType.RowHeader) {
-                if (numbersSource) {
-                    var row = flex.rows[e.row];
-                    var source = flex.collectionView.sourceCollection;
-                    var n = source.indexOf(row.dataItem) + 1;
-                    e.cell.textContent = n.toString();
-                } else if (numbersOrdinal) {
-                    e.cell.textContent = (e.row + 1).toString();
+            if (e.panel.cellType == wijmo.grid.CellType.RowHeader) {
+                var row = flex.rows[e.row];
+                if (!(row instanceof wijmo.grid._NewRowTemplate)) {
+                    if (numbersSource) {
+                        var source = flex.collectionView.sourceCollection;
+                        var n = source.indexOf(row.dataItem) + 1;
+                        e.cell.textContent = n.toString();
+                    } else if (numbersOrdinal) {
+                        e.cell.textContent = (e.row + 1).toString();
+                    }
                 }
             }
         }
@@ -183,6 +185,21 @@ function initPage() {
         }
     });
 
+    flex.pastedCell.addHandler(function(s, e) {
+        var oldValue = e.data;
+        var newValue = s.getCellData(e.row, e.col);
+        if (oldValue !== newValue) {
+            var row = s.rows[e.row];
+            var source = s.collectionView.sourceCollection;
+            vscode.postMessage({
+                cellEditEnded: true,
+                row: source.indexOf(row.dataItem),
+                col: e.col,
+                value: newValue
+            });
+        }
+    });
+
     flex.rowEditEnded.addHandler(function(s, e) {
         vscode.postMessage({
             rowEditEnded: true,

diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
     "name": "gc-excelviewer",
     "displayName": "Excel Viewer",
     "description": "Edit Excel spreadsheets and CSV files in Visual Studio Code and VS Code for the Web.",
-    "version": "4.2.54",
+    "version": "4.2.55",
     "icon": "img/gc-excelviewer.png",
     "publisher": "GrapeCity",
     "license": "SEE LICENSE IN LICENSE.txt",

diff --git a/src/csvDocumentView.ts b/src/csvDocumentView.ts
@@ -90,6 +90,11 @@ export default class CsvDocumentView extends BaseDocumentView {
 
         this._currentRange = new Range(row + offset, 0, row + offset + 1, 0);
         let line = this._document.getText(this._currentRange);
+        let eol = this.endOfLine();
+
+        if (line.endsWith(eol)) {
+            line = line.substring(0, line.length - eol.length);
+        }
 
         // http://markmintoff.com/2013/03/regex-split-by-comma-not-surrounded-by-quotes/
         let regexItems = new RegExp(`${sep}(?=(?:[^${quote}]*${quote}[^${quote}]*${quote})*[^${quote}]*$)`);