fix: coping \r\n (#35)

package.json

@@ -2,7 +2,7 @@
   "name": "diff-merge",
   "displayName": "Diff & Merge",
   "description": "Show diffs and merge",
-  "version": "0.4.2",
+  "version": "0.4.3",
   "repository": {
     "type": "git",
     "url": "https://github.com/moshfeu/vscode-diff-merge"

resources/monaco/jsconfig.json

@@ -1,6 +1,7 @@
 {
   "compilerOptions": {
-    "checkJs": true
+    "checkJs": true,
+    "target": "es2015",
   },
   "exclude": ["node_modules"]
 }

resources/monaco/package.json

@@ -6,6 +6,9 @@
   "scripts": {
     "start": "http-server -p 12345",
     "build": "webpack",
+    "mocha": "mocha dist/test.bundle.js",
+    "test:unit": "webpack --config webpack.config.test.js && yarn mocha",
+    "test:unit:dev": "webpack --config webpack.config.test.dev.js",
     "build:dev": "webpack --config webpack.config.dev.js --watch"
   },
   "dependencies": {
@@ -15,6 +18,7 @@
     "css-loader": "^3.2.1",
     "file-loader": "^5.0.2",
     "http-server": "^0.12.0",
+    "mocha": "^8.3.0",
     "style-loader": "^1.0.1",
     "webpack": "^4.41.2",
     "webpack-cli": "^3.3.10",

resources/monaco/src/tests/utils.test.js

@@ -0,0 +1,19 @@
+const assert = require('assert');
+const { getChangeOriginalValue } = require('../utils');
+
+describe('getChangeOriginalValue', () => {
+  it('\\r + \\n', () => {
+    const originalValue = getChangeOriginalValue(
+      {
+        originalStartLineNumber: 1,
+        originalEndLineNumber: 2,
+      },
+      {
+        originalEditor: {
+          getValue: () => `<?php\r\ndefine('SUSPECT_THRESHOLD', 0.3);`,
+        },
+      }
+    );
+    assert.strictEqual(originalValue.includes('\r'), false);
+  });
+});

resources/monaco/src/utils.js

@@ -1,3 +1,5 @@
+/// <reference path="../node_modules/monaco-editor/monaco.d.ts" />
+
 let cacheActionsLines = [];
 let diffActionsNode,
   diffEditor,
@@ -51,6 +53,10 @@ export function swap() {
   setEditorValue(modifiedEditor, leftValue);
 }
 
+/**
+ * @param {string} path
+ * @param {string} qs
+ */
 function generateMonacoFakeUri(path, qs) {
   if (path) {
     const prefixPath = path.startsWith('/') ? '' : '/';
@@ -150,9 +156,10 @@ function applyOriginalLines(originalLines, replacer, diffEditor) {
   diffEditor.modifiedEditor.executeEdits('diff-merge', [diff]);
 }
 
-function getChangeOriginalValue(change, diffEditor) {
+export function getChangeOriginalValue(change, diffEditor) {
   return diffEditor.originalEditor
     .getValue()
+    .replace(/\r\n/g, '\n')
     .split(/(?<=[\n\r])/gm)
     .slice(change.originalStartLineNumber - 1, change.originalEndLineNumber)
     .join('');

resources/monaco/webpack.config.dev.js

@@ -4,5 +4,5 @@ const merge = require('webpack-merge');
 module.exports = merge(config, {
   mode: 'development',
   watch: true,
-  devtool: 'eval-source-map'
-});
+  devtool: 'inline-source-map',
+});

resources/monaco/webpack.config.test.dev.js

@@ -0,0 +1,18 @@
+const { spawn } = require('child_process');
+const config = require('./webpack.config.test');
+const { scripts } = require('./package.json');
+
+module.exports = {
+  ...config,
+  watch: true,
+  plugins: [
+    {
+      apply: (compiler) => {
+        compiler.hooks.afterCompile.tap('jest', () => {
+          const [command, ...args] = scripts.mocha.split(/ /g);
+          spawn(command, args, { stdio: 'inherit' });
+        });
+      },
+    },
+  ],
+};

resources/monaco/webpack.config.test.js

@@ -0,0 +1,11 @@
+const config = require('./webpack.config.dev');
+
+module.exports = {
+  ...config,
+  mode: 'development',
+  watch: false,
+  devtool: 'inline-source-map',
+  entry: {
+    test: './src/tests/utils.test.js',
+  },
+};