fix escape sequences when extracting string literals (nicksnyder#244)

danniel1205 · Jan 18, 2021 · c587b0d · c587b0d
1 parent a5b9f57
commit c587b0d
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 3 deletions.
diff --git a/v2/goi18n/extract_command.go b/v2/goi18n/extract_command.go
@@ -9,6 +9,7 @@ import (
  "io/ioutil"
  "os"
  "path/filepath"
+ "strconv"
  "strings"
 
  "github.com/nicksnyder/go-i18n/v2/i18n"
@@ -240,9 +241,9 @@ func extractStringLiteral(expr ast.Expr) (string, bool) {
  if v.Kind != token.STRING {
  return "", false
  }
- s := v.Value[1 : len(v.Value)-1]
- if v.Value[0] == '"' {
- s = strings.Replace(s, `\"`, `"`, -1)
+ s, err := strconv.Unquote(v.Value)
+ if err != nil {
+ return "", false
  }
  return s, true
  case *ast.BinaryExpr:

diff --git a/v2/goi18n/extract_command_test.go b/v2/goi18n/extract_command_test.go
@@ -33,6 +33,21 @@ func TestExtract(t *testing.T) {
  }
  `,
  },
+ {
+ name: "escape newline",
+ fileName: "file.go",
+ file: `package main
+
+ import "github.com/nicksnyder/go-i18n/v2/i18n"
+
+ var hasnewline = &i18n.Message{
+ ID: "hasnewline",
+ Other: "\nfoo\nbar\\",
+ }
+ `,
+ activeFile: []byte(`hasnewline = "\nfoo\nbar\\"
+`),
+ },
  {
  name: "escape",
  fileName: "file.go",