Merge branch 'fix-lang-syntax-terraform' into 'master'

Fix terraform language syntax in IDE

See merge request gitlab-org/gitlab!44826

app/assets/javascripts/ide/lib/languages/hcl.js

@@ -144,7 +144,7 @@ const language = {
     ],
     heredocBody: [
       [
-        /^([\w\-]+)$/,
+        /([\w\-]+)$/,
         {
           cases: {
             '$1==$S2': [

spec/frontend/ide/lib/languages/hcl_spec.js

@@ -284,6 +284,42 @@ describe('tokenization for .tf files', () => {
         ],
       ],
     ],
+    [
+      `  foo = <<-EOF
+  bar
+  EOF`,
+      [
+        [
+          { language: 'hcl', offset: 0, type: '' },
+          { language: 'hcl', offset: 2, type: 'variable.hcl' },
+          { language: 'hcl', offset: 5, type: '' },
+          { language: 'hcl', offset: 6, type: 'operator.hcl' },
+          { language: 'hcl', offset: 7, type: '' },
+          { language: 'hcl', offset: 8, type: 'string.heredoc.delimiter.hcl' },
+        ],
+        [{ language: 'hcl', offset: 0, type: 'string.heredoc.hcl' }],
+        [
+          { language: 'hcl', offset: 0, type: 'string.heredoc.hcl' },
+          { language: 'hcl', offset: 2, type: 'string.heredoc.delimiter.hcl' },
+        ],
+      ],
+    ],
+    [
+      `foo = <<-EOF
+bar
+EOF`,
+      [
+        [
+          { language: 'hcl', offset: 0, type: 'variable.hcl' },
+          { language: 'hcl', offset: 3, type: '' },
+          { language: 'hcl', offset: 4, type: 'operator.hcl' },
+          { language: 'hcl', offset: 5, type: '' },
+          { language: 'hcl', offset: 6, type: 'string.heredoc.delimiter.hcl' },
+        ],
+        [{ language: 'hcl', offset: 0, type: 'string.heredoc.hcl' }],
+        [{ language: 'hcl', offset: 0, type: 'string.heredoc.delimiter.hcl' }],
+      ],
+    ],
   ])('%s', (string, tokens) => {
     expect(editor.tokenize(string, 'hcl')).toEqual(tokens);
   });