arduino#919: Fixed empty string to URLs conversion

Closes arduino#919.

Signed-off-by: Akos Kitta <[email protected]>

Author: kittaakos

arduino-ide-extension/src/browser/dialogs/settings/settings-component.tsx

@@ -10,6 +10,7 @@ import { FileDialogService } from '@theia/filesystem/lib/browser/file-dialog/fil
 import { DisposableCollection } from '@theia/core/lib/common/disposable';
 import {
   CompilerWarningLiterals,
+  Config,
   Network,
   ProxySettings,
 } from '../../../common/protocol';
@@ -496,7 +497,7 @@ export class SettingsComponent extends React.Component<
     event: React.ChangeEvent<HTMLInputElement>
   ): void => {
     this.setState({
-      additionalUrls: event.target.value.split(',').map((url) => url.trim()),
+      additionalUrls: Config.parseAdditionalUrls(event.target.value, ','),
     });
   };
 

arduino-ide-extension/src/browser/dialogs/settings/settings-dialog.tsx

@@ -11,6 +11,7 @@ import { FileDialogService } from '@theia/filesystem/lib/browser/file-dialog/fil
 import { nls } from '@theia/core/lib/common';
 import { SettingsComponent } from './settings-component';
 import { AsyncLocalizationProvider } from '@theia/core/lib/common/i18n/localization';
+import { Config } from '../../../common/protocol';
 
 @injectable()
 export class SettingsWidget extends ReactWidget {
@@ -96,7 +97,7 @@ export class SettingsDialog extends AbstractDialog<Promise<Settings>> {
     this.update();
   }
 
-  protected onUpdateRequest(msg: Message) {
+  protected onUpdateRequest(msg: Message): void {
     super.onUpdateRequest(msg);
     this.widget.update();
   }
@@ -105,7 +106,7 @@ export class SettingsDialog extends AbstractDialog<Promise<Settings>> {
     super.onActivateRequest(msg);
 
     // calling settingsService.reset() in order to reload the settings from the preferenceService
-    // and update the UI including changes triggerd from the command palette
+    // and update the UI including changes triggered from the command palette
     this.settingsService.reset();
 
     this.widget.activate();
@@ -168,10 +169,7 @@ export class AdditionalUrlsDialog extends AbstractDialog<string[]> {
   }
 
   get value(): string[] {
-    return this.textArea.value
-      .split('\n')
-      .map((url) => url.trim())
-      .filter((url) => !!url);
+    return Config.parseAdditionalUrls(this.textArea.value, 'newline');
   }
 
   protected onAfterAttach(message: Message): void {

arduino-ide-extension/src/common/protocol/config-service.ts

@@ -140,4 +140,14 @@ export namespace Config {
       Network.sameAs(left.network, right.network)
     );
   }
+  export function parseAdditionalUrls(
+    value: string,
+    delimiter: ',' | 'newline'
+  ): string[] {
+    return value
+      .trim()
+      .split(delimiter === ',' ? delimiter : /\r?\n/)
+      .map((url) => url.trim())
+      .filter((url) => !!url);
+  }
 }

arduino-ide-extension/src/test/common/config-service.test.ts

@@ -0,0 +1,26 @@
+import { expect } from 'chai';
+import { Config } from '../../common/protocol';
+
+describe('config-service', () => {
+  describe('parseAdditionalUrls', () => {
+    it('should parse an empty string as an empty array', () => {
+      expect(Config.parseAdditionalUrls('', ',')).to.be.empty;
+    });
+    it('should parse a blank string as an empty array', () => {
+      expect(Config.parseAdditionalUrls('   ', ',')).to.be.empty;
+    });
+    it('should parse urls with commas', () => {
+      expect(
+        Config.parseAdditionalUrls('  ,a  , b , c,   ', ',')
+      ).to.be.deep.equal(['a', 'b', 'c']);
+    });
+    it("should parse urls with both '\\n' and '\\r\\n' line endings", () => {
+      expect(
+        Config.parseAdditionalUrls(
+          'a ' + '\r\n' + '   b ' + '\n' + '   c ' + '\r\n' + '  ' + '\n' + '',
+          'newline'
+        )
+      ).to.be.deep.equal(['a', 'b', 'c']);
+    });
+  });
+});