Merge pull request #50 from svanharmelen/b-continuation-indents

Add a comma to the regexp

Author: Wliu

settings/language-go.cson

@@ -2,5 +2,5 @@
   'editor':
     'commentStart': '// '
     'increaseIndentPattern': '^.*(\\bcase\\b.*:|\\bdefault\\b:|(\\b(func|if|else|switch|select|for|struct)\\b.*|\\w)\\{[^}]*|\\([^)]*)$'
-    'decreaseNextIndentPattern': '^\\s*[^\\s()}]+(?<m>[^()]*\\((?:\\g<m>|[^()]*)\\)[^()]*)*[^()]*\\)$'
-    'decreaseIndentPattern': '^\\s*(\\bcase\\b.*:|\\bdefault\\b:|\\}[),]?|\\))$'
+    'decreaseIndentPattern': '^\\s*(\\bcase\\b.*:|\\bdefault\\b:|\\}[),]?|\\)[,]?)$'
+    'decreaseNextIndentPattern': '^\\s*[^\\s()}]+(?<m>[^()]*\\((?:\\g<m>|[^()]*)\\)[^()]*)*[^()]*\\)[,]?$'

spec/language-go-spec.coffee

@@ -0,0 +1,51 @@
+describe 'Go settings', ->
+  [editor, languageMode] = []
+
+  afterEach ->
+    editor.destroy()
+
+  beforeEach ->
+    waitsForPromise ->
+      atom.workspace.open('sample.go').then (o) ->
+        editor = o
+        languageMode = editor.languageMode
+
+    waitsForPromise ->
+      atom.packages.activatePackage('language-go')
+
+  it 'matches lines correctly using the increaseIndentPattern', ->
+    increaseIndentRegex = languageMode.increaseIndentRegexForScopeDescriptor(['source.go'])
+
+    expect(increaseIndentRegex.testSync('  case true:')).toBeTruthy()
+    expect(increaseIndentRegex.testSync('  default:')).toBeTruthy()
+    expect(increaseIndentRegex.testSync('func something() {')).toBeTruthy()
+    expect(increaseIndentRegex.testSync('  if true {')).toBeTruthy()
+    expect(increaseIndentRegex.testSync('  else {')).toBeTruthy()
+    expect(increaseIndentRegex.testSync('  switch {')).toBeTruthy()
+    expect(increaseIndentRegex.testSync('  switch true {')).toBeTruthy()
+    expect(increaseIndentRegex.testSync('  select {')).toBeTruthy()
+    expect(increaseIndentRegex.testSync('  select true {')).toBeTruthy()
+    expect(increaseIndentRegex.testSync('  for v := range val {')).toBeTruthy()
+    expect(increaseIndentRegex.testSync('  for i := 0; i < 10; i++ {')).toBeTruthy()
+    expect(increaseIndentRegex.testSync('  for i := 0; i < 10; i++ {')).toBeTruthy()
+    expect(increaseIndentRegex.testSync('  type something struct {')).toBeTruthy()
+    expect(increaseIndentRegex.testSync('  fmt.Printf("some%s",')).toBeTruthy()
+
+  it 'matches lines correctly using the decreaseIndentPattern', ->
+    decreaseIndentRegex = languageMode.decreaseIndentRegexForScopeDescriptor(['source.go'])
+
+    expect(decreaseIndentRegex.testSync('  case true:')).toBeTruthy()
+    expect(decreaseIndentRegex.testSync('  default:')).toBeTruthy()
+    expect(decreaseIndentRegex.testSync('  }')).toBeTruthy()
+    expect(decreaseIndentRegex.testSync('  },')).toBeTruthy()
+    expect(decreaseIndentRegex.testSync('  )')).toBeTruthy()
+    expect(decreaseIndentRegex.testSync('  ),')).toBeTruthy()
+
+  it 'matches lines correctly using the decreaseNextIndentPattern', ->
+    decreaseNextIndentRegex = languageMode.decreaseNextIndentRegexForScopeDescriptor(['source.go'])
+
+    expect(decreaseNextIndentRegex.testSync('  fmt.Println("something"))')).toBeTruthy()
+    expect(decreaseNextIndentRegex.testSync('  fmt.Println("something")),')).toBeTruthy()
+
+    expect(decreaseNextIndentRegex.testSync('  fmt.Println("something")')).toBeFalsy()
+    expect(decreaseNextIndentRegex.testSync('  fmt.Println("something"),')).toBeFalsy()