fix: add ignoreEol setting (#547)

atom-community · Sep 4, 2020 · f7f4f52 · f7f4f52
1 parent 656aa5b
commit f7f4f52
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 2 deletions.
diff --git a/lib/config.js b/lib/config.js
@@ -130,6 +130,12 @@ const config = {
 		default: false,
 		description: "Mute 'Latest backup is already applied' message.",
 	},
+	ignoreEol: {
+		title: 'Ignore EOL',
+		description: 'Ignore end of line characters when checking backup.',
+		type: 'boolean',
+		default: false,
+	},
 	hiddenSettings: {
 		title: 'Hidden Settings',
 		type: 'object',

diff --git a/lib/sync-settings.js b/lib/sync-settings.js
@@ -616,8 +616,12 @@ module.exports = class SyncSettings {
 				const localFile = localData.files ? localData.files[fileName] : null
 				if (backupFile && localFile) {
 					const isBinary = isBinaryPath(fileName)
-					const localContent = localFile.content.toString(isBinary ? 'base64' : 'utf8')
-					const backupContent = backupFile.content.toString(isBinary ? 'base64' : 'utf8')
+					let localContent = localFile.content.toString(isBinary ? 'base64' : 'utf8')
+					let backupContent = backupFile.content.toString(isBinary ? 'base64' : 'utf8')
+					if (atom.config.get('sync-settings.ignoreEol')) {
+						localContent = localContent.replace(/\r\n/g, '\n')
+						backupContent = backupContent.replace(/\r\n/g, '\n')
+					}
 					if (localContent !== backupContent) {
 						let content
 						if (isBinary) {

diff --git a/spec/sync-settings-spec.js b/spec/sync-settings-spec.js
@@ -912,6 +912,27 @@ describe('syncSettings', () => {
 				},
 			})
 		})
+
+		it('ignore same files with diff EOL', async () => {
+			atom.config.set('sync-settings.ignoreEol', true)
+			const diffData = await syncSettings.getDiffData({
+				files: {
+					added: { content: 'added\r\n' },
+					updated: { content: 'updated\r\n' },
+				},
+			}, {
+				files: {
+					added: { content: 'added\n' },
+					updated: { content: 'updated\n' },
+				},
+			})
+
+			expect(diffData).toEqual({
+				settings: null,
+				packages: null,
+				files: null,
+			})
+		})
 	})
 
 	describe('check for update', () => {