Handle escaping of the control character

sources/LocalizationEditor/Providers/Parser.swift

@@ -192,19 +192,53 @@ class Parser {
  }
  return nil
  }
- /// This function finds the index where a given enclosing control character can be found. This index determies where this token may be terminated.
+
+ /// Returns the first unescaped index where the control character was found in the input string.
+ /// - Parameters:
+ /// - control: The enclosing control character whose first appearance should be found.
+ /// - input: The string to search for the control character in.
+ /// - escape: The escape character to check for when searching the input string.
+ /// - Returns: The input's first index where the control character was found.
+ private func firstUnescapedInstance(of control: EnclosingControlCharacters, in input: String, escape: Character = "\\") -> String.Index? {
+ let controlString = control.rawValue
+
+ // If the control is a single character in length, then check for the escape character. This allows for value strings to contain an escaped quote.
+ if controlString.count == 1 {
+ let controlCharacter = controlString[controlString.startIndex]
+ var iterator = input.indices.makeIterator()
+ while let index = iterator.next() {
+ switch input[index] {
+ // We've found an unescaped instance of the control character.
+ case controlCharacter:
+ return index
+ // If we find the escape character then we should skip a character.
+ case escape:
+ _ = iterator.next()
+ default:
+ break
+ }
+ }
+
+ return nil
+ // Otherwise just do a simple substring search.
+ } else {
+ return input.index(of: controlString)
+ }
+ }
+
+ /// This function finds the index where a given enclosing control character can be found. This index determines where this token may be terminated.
  ///
  /// - Parameter control: The enclosing control character whose first appearance should be found.
  /// - Returns: The index of the input control character relative to the start index of the input string.
  private func endIndex(for control: EnclosingControlCharacters) -> String.Index {
  // Search for the end of the command.
  let endIndex: String.Index
- if let closeIndex = input.index(of: control.rawValue) {
+ if let closeIndex = firstUnescapedInstance(of: control, in: input) {
  // Closing index found.
  endIndex = closeIndex
  } else {
  // Find another way to end the enclosed text. Most likely the input is not well formatted. Keep on trying.
- print("Badly formatted control characters! Maybe because the user has some \" in the comments that can not be handled, yet.")
+ print("Badly formatted control characters!")
 
  var recoveryIndex: String.Index
  if let messageEndIndex = input.index(of: EnclosingControlCharacters.messageBoundaryClose.rawValue) {

sources/LocalizationEditorTests/Data/Special.strings

@@ -6,4 +6,7 @@
  Copyright © 2019 Igor Kulman. All rights reserved.
 */
 
-"quoted" = "some \"quoted\" message";
+/* The presence of a non-quoted string and a quoted string would previously cause the quoted string to be dropped. This string is here to check for regressions in quoted string parsing. */
+"regression_test" = "DO NOT DELETE";
+
+"quoted" = "\"http://\" or \"https://\"";

sources/LocalizationEditorTests/LocalizationProviderParsingTests.swift

@@ -74,6 +74,6 @@ class LocalizationProviderParsingTests: XCTestCase {
  let provider = LocalizationProvider()
  let groups = provider.getLocalizations(url: createTestingDirectory(with: [TestFile(originalFileName: "Special.strings", destinationFileName: "LocalizableStrings.strings", destinationFolder: "Base.lproj")]))
 
- XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "some \"quoted\" message")
+ XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "\"http://\" or \"https://\"")
  }
 }

sources/LocalizationEditor/Providers/Parser.swift

@@ -192,19 +192,53 @@ class Parser {
  }
  return nil
  }
- /// This function finds the index where a given enclosing control character can be found. This index determies where this token may be terminated.
+
+ /// Returns the first unescaped index where the control character was found in the input string.
+ /// - Parameters:
+ /// - control: The enclosing control character whose first appearance should be found.
+ /// - input: The string to search for the control character in.
+ /// - escape: The escape character to check for when searching the input string.
+ /// - Returns: The input's first index where the control character was found.
+ private func firstUnescapedInstance(of control: EnclosingControlCharacters, in input: String, escape: Character = "\\") -> String.Index? {
+ let controlString = control.rawValue
+
+ // If the control is a single character in length, then check for the escape character. This allows for value strings to contain an escaped quote.
+ if controlString.count == 1 {
+ let controlCharacter = controlString[controlString.startIndex]
+ var iterator = input.indices.makeIterator()
+ while let index = iterator.next() {
+ switch input[index] {
+ // We've found an unescaped instance of the control character.
+ case controlCharacter:
+ return index
+ // If we find the escape character then we should skip a character.
+ case escape:
+ _ = iterator.next()
+ default:
+ break
+ }
+ }
+
+ return nil
+ // Otherwise just do a simple substring search.
+ } else {
+ return input.index(of: controlString)
+ }
+ }
+
+ /// This function finds the index where a given enclosing control character can be found. This index determines where this token may be terminated.
  ///
  /// - Parameter control: The enclosing control character whose first appearance should be found.
  /// - Returns: The index of the input control character relative to the start index of the input string.
  private func endIndex(for control: EnclosingControlCharacters) -> String.Index {
  // Search for the end of the command.
  let endIndex: String.Index
- if let closeIndex = input.index(of: control.rawValue) {
+ if let closeIndex = firstUnescapedInstance(of: control, in: input) {
  // Closing index found.
  endIndex = closeIndex
  } else {
  // Find another way to end the enclosed text. Most likely the input is not well formatted. Keep on trying.
- print("Badly formatted control characters! Maybe because the user has some \" in the comments that can not be handled, yet.")
+ print("Badly formatted control characters!")
 
  var recoveryIndex: String.Index
  if let messageEndIndex = input.index(of: EnclosingControlCharacters.messageBoundaryClose.rawValue) {

sources/LocalizationEditorTests/Data/Special.strings

@@ -6,4 +6,7 @@
  Copyright © 2019 Igor Kulman. All rights reserved.
 */
 
-"quoted" = "some \"quoted\" message";
+/* The presence of a non-quoted string and a quoted string would previously cause the quoted string to be dropped. This string is here to check for regressions in quoted string parsing. */
+"regression_test" = "DO NOT DELETE";
+
+"quoted" = "\"http://\" or \"https://\"";

sources/LocalizationEditorTests/LocalizationProviderParsingTests.swift

@@ -74,6 +74,6 @@ class LocalizationProviderParsingTests: XCTestCase {
  let provider = LocalizationProvider()
  let groups = provider.getLocalizations(url: createTestingDirectory(with: [TestFile(originalFileName: "Special.strings", destinationFileName: "LocalizableStrings.strings", destinationFolder: "Base.lproj")]))
 
- XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "some \"quoted\" message")
+ XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "\"http://\" or \"https://\"")
  }
 }

sources/LocalizationEditor/Providers/Parser.swift

@@ -192,19 +192,53 @@ class Parser {
  }
  return nil
  }
- /// This function finds the index where a given enclosing control character can be found. This index determies where this token may be terminated.
+
+ /// Returns the first unescaped index where the control character was found in the input string.
+ /// - Parameters:
+ /// - control: The enclosing control character whose first appearance should be found.
+ /// - input: The string to search for the control character in.
+ /// - escape: The escape character to check for when searching the input string.
+ /// - Returns: The input's first index where the control character was found.
+ private func firstUnescapedInstance(of control: EnclosingControlCharacters, in input: String, escape: Character = "\\") -> String.Index? {
+ let controlString = control.rawValue
+
+ // If the control is a single character in length, then check for the escape character. This allows for value strings to contain an escaped quote.
+ if controlString.count == 1 {
+ let controlCharacter = controlString[controlString.startIndex]
+ var iterator = input.indices.makeIterator()
+ while let index = iterator.next() {
+ switch input[index] {
+ // We've found an unescaped instance of the control character.
+ case controlCharacter:
+ return index
+ // If we find the escape character then we should skip a character.
+ case escape:
+ _ = iterator.next()
+ default:
+ break
+ }
+ }
+
+ return nil
+ // Otherwise just do a simple substring search.
+ } else {
+ return input.index(of: controlString)
+ }
+ }
+
+ /// This function finds the index where a given enclosing control character can be found. This index determines where this token may be terminated.
  ///
  /// - Parameter control: The enclosing control character whose first appearance should be found.
  /// - Returns: The index of the input control character relative to the start index of the input string.
  private func endIndex(for control: EnclosingControlCharacters) -> String.Index {
  // Search for the end of the command.
  let endIndex: String.Index
- if let closeIndex = input.index(of: control.rawValue) {
+ if let closeIndex = firstUnescapedInstance(of: control, in: input) {
  // Closing index found.
  endIndex = closeIndex
  } else {
  // Find another way to end the enclosed text. Most likely the input is not well formatted. Keep on trying.
- print("Badly formatted control characters! Maybe because the user has some \" in the comments that can not be handled, yet.")
+ print("Badly formatted control characters!")
 
  var recoveryIndex: String.Index
  if let messageEndIndex = input.index(of: EnclosingControlCharacters.messageBoundaryClose.rawValue) {

sources/LocalizationEditorTests/Data/Special.strings

@@ -6,4 +6,7 @@
  Copyright © 2019 Igor Kulman. All rights reserved.
 */
 
-"quoted" = "some \"quoted\" message";
+/* The presence of a non-quoted string and a quoted string would previously cause the quoted string to be dropped. This string is here to check for regressions in quoted string parsing. */
+"regression_test" = "DO NOT DELETE";
+
+"quoted" = "\"http://\" or \"https://\"";

sources/LocalizationEditorTests/LocalizationProviderParsingTests.swift

@@ -74,6 +74,6 @@ class LocalizationProviderParsingTests: XCTestCase {
  let provider = LocalizationProvider()
  let groups = provider.getLocalizations(url: createTestingDirectory(with: [TestFile(originalFileName: "Special.strings", destinationFileName: "LocalizableStrings.strings", destinationFolder: "Base.lproj")]))
 
- XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "some \"quoted\" message")
+ XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "\"http://\" or \"https://\"")
  }
 }

sources/LocalizationEditor/Providers/Parser.swift

@@ -192,19 +192,53 @@ class Parser {
  }
  return nil
  }
- /// This function finds the index where a given enclosing control character can be found. This index determies where this token may be terminated.
+
+ /// Returns the first unescaped index where the control character was found in the input string.
+ /// - Parameters:
+ /// - control: The enclosing control character whose first appearance should be found.
+ /// - input: The string to search for the control character in.
+ /// - escape: The escape character to check for when searching the input string.
+ /// - Returns: The input's first index where the control character was found.
+ private func firstUnescapedInstance(of control: EnclosingControlCharacters, in input: String, escape: Character = "\\") -> String.Index? {
+ let controlString = control.rawValue
+
+ // If the control is a single character in length, then check for the escape character. This allows for value strings to contain an escaped quote.
+ if controlString.count == 1 {
+ let controlCharacter = controlString[controlString.startIndex]
+ var iterator = input.indices.makeIterator()
+ while let index = iterator.next() {
+ switch input[index] {
+ // We've found an unescaped instance of the control character.
+ case controlCharacter:
+ return index
+ // If we find the escape character then we should skip a character.
+ case escape:
+ _ = iterator.next()
+ default:
+ break
+ }
+ }
+
+ return nil
+ // Otherwise just do a simple substring search.
+ } else {
+ return input.index(of: controlString)
+ }
+ }
+
+ /// This function finds the index where a given enclosing control character can be found. This index determines where this token may be terminated.
  ///
  /// - Parameter control: The enclosing control character whose first appearance should be found.
  /// - Returns: The index of the input control character relative to the start index of the input string.
  private func endIndex(for control: EnclosingControlCharacters) -> String.Index {
  // Search for the end of the command.
  let endIndex: String.Index
- if let closeIndex = input.index(of: control.rawValue) {
+ if let closeIndex = firstUnescapedInstance(of: control, in: input) {
  // Closing index found.
  endIndex = closeIndex
  } else {
  // Find another way to end the enclosed text. Most likely the input is not well formatted. Keep on trying.
- print("Badly formatted control characters! Maybe because the user has some \" in the comments that can not be handled, yet.")
+ print("Badly formatted control characters!")
 
  var recoveryIndex: String.Index
  if let messageEndIndex = input.index(of: EnclosingControlCharacters.messageBoundaryClose.rawValue) {

sources/LocalizationEditorTests/Data/Special.strings

@@ -6,4 +6,7 @@
  Copyright © 2019 Igor Kulman. All rights reserved.
 */
 
-"quoted" = "some \"quoted\" message";
+/* The presence of a non-quoted string and a quoted string would previously cause the quoted string to be dropped. This string is here to check for regressions in quoted string parsing. */
+"regression_test" = "DO NOT DELETE";
+
+"quoted" = "\"http://\" or \"https://\"";

sources/LocalizationEditorTests/LocalizationProviderParsingTests.swift

@@ -74,6 +74,6 @@ class LocalizationProviderParsingTests: XCTestCase {
  let provider = LocalizationProvider()
  let groups = provider.getLocalizations(url: createTestingDirectory(with: [TestFile(originalFileName: "Special.strings", destinationFileName: "LocalizableStrings.strings", destinationFolder: "Base.lproj")]))
 
- XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "some \"quoted\" message")
+ XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "\"http://\" or \"https://\"")
  }
 }

sources/LocalizationEditor/Providers/Parser.swift

@@ -192,19 +192,53 @@ class Parser {
  }
  return nil
  }
- /// This function finds the index where a given enclosing control character can be found. This index determies where this token may be terminated.
+
+ /// Returns the first unescaped index where the control character was found in the input string.
+ /// - Parameters:
+ /// - control: The enclosing control character whose first appearance should be found.
+ /// - input: The string to search for the control character in.
+ /// - escape: The escape character to check for when searching the input string.
+ /// - Returns: The input's first index where the control character was found.
+ private func firstUnescapedInstance(of control: EnclosingControlCharacters, in input: String, escape: Character = "\\") -> String.Index? {
+ let controlString = control.rawValue
+
+ // If the control is a single character in length, then check for the escape character. This allows for value strings to contain an escaped quote.
+ if controlString.count == 1 {
+ let controlCharacter = controlString[controlString.startIndex]
+ var iterator = input.indices.makeIterator()
+ while let index = iterator.next() {
+ switch input[index] {
+ // We've found an unescaped instance of the control character.
+ case controlCharacter:
+ return index
+ // If we find the escape character then we should skip a character.
+ case escape:
+ _ = iterator.next()
+ default:
+ break
+ }
+ }
+
+ return nil
+ // Otherwise just do a simple substring search.
+ } else {
+ return input.index(of: controlString)
+ }
+ }
+
+ /// This function finds the index where a given enclosing control character can be found. This index determines where this token may be terminated.
  ///
  /// - Parameter control: The enclosing control character whose first appearance should be found.
  /// - Returns: The index of the input control character relative to the start index of the input string.
  private func endIndex(for control: EnclosingControlCharacters) -> String.Index {
  // Search for the end of the command.
  let endIndex: String.Index
- if let closeIndex = input.index(of: control.rawValue) {
+ if let closeIndex = firstUnescapedInstance(of: control, in: input) {
  // Closing index found.
  endIndex = closeIndex
  } else {
  // Find another way to end the enclosed text. Most likely the input is not well formatted. Keep on trying.
- print("Badly formatted control characters! Maybe because the user has some \" in the comments that can not be handled, yet.")
+ print("Badly formatted control characters!")
 
  var recoveryIndex: String.Index
  if let messageEndIndex = input.index(of: EnclosingControlCharacters.messageBoundaryClose.rawValue) {

sources/LocalizationEditorTests/Data/Special.strings

@@ -6,4 +6,7 @@
  Copyright © 2019 Igor Kulman. All rights reserved.
 */
 
-"quoted" = "some \"quoted\" message";
+/* The presence of a non-quoted string and a quoted string would previously cause the quoted string to be dropped. This string is here to check for regressions in quoted string parsing. */
+"regression_test" = "DO NOT DELETE";
+
+"quoted" = "\"http://\" or \"https://\"";

sources/LocalizationEditorTests/LocalizationProviderParsingTests.swift

@@ -74,6 +74,6 @@ class LocalizationProviderParsingTests: XCTestCase {
  let provider = LocalizationProvider()
  let groups = provider.getLocalizations(url: createTestingDirectory(with: [TestFile(originalFileName: "Special.strings", destinationFileName: "LocalizableStrings.strings", destinationFolder: "Base.lproj")]))
 
- XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "some \"quoted\" message")
+ XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "\"http://\" or \"https://\"")
  }
 }

sources/LocalizationEditor/Providers/Parser.swift

@@ -192,19 +192,53 @@ class Parser {
  }
  return nil
  }
- /// This function finds the index where a given enclosing control character can be found. This index determies where this token may be terminated.
+
+ /// Returns the first unescaped index where the control character was found in the input string.
+ /// - Parameters:
+ /// - control: The enclosing control character whose first appearance should be found.
+ /// - input: The string to search for the control character in.
+ /// - escape: The escape character to check for when searching the input string.
+ /// - Returns: The input's first index where the control character was found.
+ private func firstUnescapedInstance(of control: EnclosingControlCharacters, in input: String, escape: Character = "\\") -> String.Index? {
+ let controlString = control.rawValue
+
+ // If the control is a single character in length, then check for the escape character. This allows for value strings to contain an escaped quote.
+ if controlString.count == 1 {
+ let controlCharacter = controlString[controlString.startIndex]
+ var iterator = input.indices.makeIterator()
+ while let index = iterator.next() {
+ switch input[index] {
+ // We've found an unescaped instance of the control character.
+ case controlCharacter:
+ return index
+ // If we find the escape character then we should skip a character.
+ case escape:
+ _ = iterator.next()
+ default:
+ break
+ }
+ }
+
+ return nil
+ // Otherwise just do a simple substring search.
+ } else {
+ return input.index(of: controlString)
+ }
+ }
+
+ /// This function finds the index where a given enclosing control character can be found. This index determines where this token may be terminated.
  ///
  /// - Parameter control: The enclosing control character whose first appearance should be found.
  /// - Returns: The index of the input control character relative to the start index of the input string.
  private func endIndex(for control: EnclosingControlCharacters) -> String.Index {
  // Search for the end of the command.
  let endIndex: String.Index
- if let closeIndex = input.index(of: control.rawValue) {
+ if let closeIndex = firstUnescapedInstance(of: control, in: input) {
  // Closing index found.
  endIndex = closeIndex
  } else {
  // Find another way to end the enclosed text. Most likely the input is not well formatted. Keep on trying.
- print("Badly formatted control characters! Maybe because the user has some \" in the comments that can not be handled, yet.")
+ print("Badly formatted control characters!")
 
  var recoveryIndex: String.Index
  if let messageEndIndex = input.index(of: EnclosingControlCharacters.messageBoundaryClose.rawValue) {

sources/LocalizationEditorTests/Data/Special.strings

@@ -6,4 +6,7 @@
  Copyright © 2019 Igor Kulman. All rights reserved.
 */
 
-"quoted" = "some \"quoted\" message";
+/* The presence of a non-quoted string and a quoted string would previously cause the quoted string to be dropped. This string is here to check for regressions in quoted string parsing. */
+"regression_test" = "DO NOT DELETE";
+
+"quoted" = "\"http://\" or \"https://\"";

sources/LocalizationEditorTests/LocalizationProviderParsingTests.swift

@@ -74,6 +74,6 @@ class LocalizationProviderParsingTests: XCTestCase {
  let provider = LocalizationProvider()
  let groups = provider.getLocalizations(url: createTestingDirectory(with: [TestFile(originalFileName: "Special.strings", destinationFileName: "LocalizableStrings.strings", destinationFolder: "Base.lproj")]))
 
- XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "some \"quoted\" message")
+ XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "\"http://\" or \"https://\"")
  }
 }

sources/LocalizationEditor/Providers/Parser.swift

@@ -192,19 +192,53 @@ class Parser {
  }
  return nil
  }
- /// This function finds the index where a given enclosing control character can be found. This index determies where this token may be terminated.
+
+ /// Returns the first unescaped index where the control character was found in the input string.
+ /// - Parameters:
+ /// - control: The enclosing control character whose first appearance should be found.
+ /// - input: The string to search for the control character in.
+ /// - escape: The escape character to check for when searching the input string.
+ /// - Returns: The input's first index where the control character was found.
+ private func firstUnescapedInstance(of control: EnclosingControlCharacters, in input: String, escape: Character = "\\") -> String.Index? {
+ let controlString = control.rawValue
+
+ // If the control is a single character in length, then check for the escape character. This allows for value strings to contain an escaped quote.
+ if controlString.count == 1 {
+ let controlCharacter = controlString[controlString.startIndex]
+ var iterator = input.indices.makeIterator()
+ while let index = iterator.next() {
+ switch input[index] {
+ // We've found an unescaped instance of the control character.
+ case controlCharacter:
+ return index
+ // If we find the escape character then we should skip a character.
+ case escape:
+ _ = iterator.next()
+ default:
+ break
+ }
+ }
+
+ return nil
+ // Otherwise just do a simple substring search.
+ } else {
+ return input.index(of: controlString)
+ }
+ }
+
+ /// This function finds the index where a given enclosing control character can be found. This index determines where this token may be terminated.
  ///
  /// - Parameter control: The enclosing control character whose first appearance should be found.
  /// - Returns: The index of the input control character relative to the start index of the input string.
  private func endIndex(for control: EnclosingControlCharacters) -> String.Index {
  // Search for the end of the command.
  let endIndex: String.Index
- if let closeIndex = input.index(of: control.rawValue) {
+ if let closeIndex = firstUnescapedInstance(of: control, in: input) {
  // Closing index found.
  endIndex = closeIndex
  } else {
  // Find another way to end the enclosed text. Most likely the input is not well formatted. Keep on trying.
- print("Badly formatted control characters! Maybe because the user has some \" in the comments that can not be handled, yet.")
+ print("Badly formatted control characters!")
 
  var recoveryIndex: String.Index
  if let messageEndIndex = input.index(of: EnclosingControlCharacters.messageBoundaryClose.rawValue) {

sources/LocalizationEditorTests/Data/Special.strings

@@ -6,4 +6,7 @@
  Copyright © 2019 Igor Kulman. All rights reserved.
 */
 
-"quoted" = "some \"quoted\" message";
+/* The presence of a non-quoted string and a quoted string would previously cause the quoted string to be dropped. This string is here to check for regressions in quoted string parsing. */
+"regression_test" = "DO NOT DELETE";
+
+"quoted" = "\"http://\" or \"https://\"";

sources/LocalizationEditorTests/LocalizationProviderParsingTests.swift

@@ -74,6 +74,6 @@ class LocalizationProviderParsingTests: XCTestCase {
  let provider = LocalizationProvider()
  let groups = provider.getLocalizations(url: createTestingDirectory(with: [TestFile(originalFileName: "Special.strings", destinationFileName: "LocalizableStrings.strings", destinationFolder: "Base.lproj")]))
 
- XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "some \"quoted\" message")
+ XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "\"http://\" or \"https://\"")
  }
 }

sources/LocalizationEditor/Providers/Parser.swift

@@ -192,19 +192,53 @@ class Parser {
  }
  return nil
  }
- /// This function finds the index where a given enclosing control character can be found. This index determies where this token may be terminated.
+
+ /// Returns the first unescaped index where the control character was found in the input string.
+ /// - Parameters:
+ /// - control: The enclosing control character whose first appearance should be found.
+ /// - input: The string to search for the control character in.
+ /// - escape: The escape character to check for when searching the input string.
+ /// - Returns: The input's first index where the control character was found.
+ private func firstUnescapedInstance(of control: EnclosingControlCharacters, in input: String, escape: Character = "\\") -> String.Index? {
+ let controlString = control.rawValue
+
+ // If the control is a single character in length, then check for the escape character. This allows for value strings to contain an escaped quote.
+ if controlString.count == 1 {
+ let controlCharacter = controlString[controlString.startIndex]
+ var iterator = input.indices.makeIterator()
+ while let index = iterator.next() {
+ switch input[index] {
+ // We've found an unescaped instance of the control character.
+ case controlCharacter:
+ return index
+ // If we find the escape character then we should skip a character.
+ case escape:
+ _ = iterator.next()
+ default:
+ break
+ }
+ }
+
+ return nil
+ // Otherwise just do a simple substring search.
+ } else {
+ return input.index(of: controlString)
+ }
+ }
+
+ /// This function finds the index where a given enclosing control character can be found. This index determines where this token may be terminated.
  ///
  /// - Parameter control: The enclosing control character whose first appearance should be found.
  /// - Returns: The index of the input control character relative to the start index of the input string.
  private func endIndex(for control: EnclosingControlCharacters) -> String.Index {
  // Search for the end of the command.
  let endIndex: String.Index
- if let closeIndex = input.index(of: control.rawValue) {
+ if let closeIndex = firstUnescapedInstance(of: control, in: input) {
  // Closing index found.
  endIndex = closeIndex
  } else {
  // Find another way to end the enclosed text. Most likely the input is not well formatted. Keep on trying.
- print("Badly formatted control characters! Maybe because the user has some \" in the comments that can not be handled, yet.")
+ print("Badly formatted control characters!")
 
  var recoveryIndex: String.Index
  if let messageEndIndex = input.index(of: EnclosingControlCharacters.messageBoundaryClose.rawValue) {

sources/LocalizationEditorTests/Data/Special.strings

@@ -6,4 +6,7 @@
  Copyright © 2019 Igor Kulman. All rights reserved.
 */
 
-"quoted" = "some \"quoted\" message";
+/* The presence of a non-quoted string and a quoted string would previously cause the quoted string to be dropped. This string is here to check for regressions in quoted string parsing. */
+"regression_test" = "DO NOT DELETE";
+
+"quoted" = "\"http://\" or \"https://\"";

sources/LocalizationEditorTests/LocalizationProviderParsingTests.swift

@@ -74,6 +74,6 @@ class LocalizationProviderParsingTests: XCTestCase {
  let provider = LocalizationProvider()
  let groups = provider.getLocalizations(url: createTestingDirectory(with: [TestFile(originalFileName: "Special.strings", destinationFileName: "LocalizableStrings.strings", destinationFolder: "Base.lproj")]))
 
- XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "some \"quoted\" message")
+ XCTAssertEqual(groups[0].localizations[0].translations.first(where: {$0.key == "quoted"})?.value, "\"http://\" or \"https://\"")
  }
 }