Merge branch 'topic/gs.292.asm_hightlighting' into 'master'

Fix Asm highlighter not working for asm file

Closes #292

See merge request eng/ide/gnatstudio!476

Author: AdrienBoulanger

share/support/languages/asm_highlighter.py

@@ -9,9 +9,7 @@
 
 @hook('gps_started')
 def on_gps_started():
-    register_highlighter(
-        language="asm",
-        spec=(
+    spec = (
             # Match comments lines
             region(r"#", "\n", tag=tag_comment,
                    highlighter=(hl_comment_notes,)),
@@ -32,6 +30,13 @@ def on_gps_started():
             region(
                 r'"', r'"|[^\\]$',  tag=tag_string,
                 highlighter=(hl_inside_strings,)
+                )
             )
-        )
+    register_highlighter(
+        language="asm",
+        spec=spec
+    )
+    register_highlighter(
+        language="asm2",
+        spec=spec
     )

share/support/languages/highlighter/engine.py

@@ -18,7 +18,7 @@ class HighlighterModule(Module):
     preferences = {}
 
     def init_highlighting(self, f):
-        highlighter = self.highlighters.get(f.language(), None)
+        highlighter = self.highlighters.get(f.language().lower(), None)
         if isinstance(highlighter, Highlighter):
             ed = GPS.EditorBuffer.get(f, open=False)
             if ed:

share/support/languages/highlighter/interface.py

@@ -383,4 +383,5 @@ def register_highlighter(language, spec, igncase=False):
     :param tuple spec: The spec of the highlighter.
     """
     from highlighter.engine import Highlighter, HighlighterModule
-    HighlighterModule.highlighters[language] = Highlighter(spec, igncase)
+    HighlighterModule.highlighters[language.lower()] = Highlighter(spec,
+                                                                   igncase)

testsuite/tests/gs.292.asm_hightlighting/bar.asm

@@ -0,0 +1 @@
+0x0000000000400400 <+0>:	mov    0x200c2e(%rip),%eax # 0x601034 <y>

testsuite/tests/gs.292.asm_hightlighting/foo.s

@@ -0,0 +1 @@
+0x0000000000400400 <+0>:	mov    0x200c2e(%rip),%eax # 0x601034 <y>

testsuite/tests/gs.292.asm_hightlighting/test.py

@@ -0,0 +1,37 @@
+"""
+Check the highlighting of assembly files.
+"""
+
+from GPS import *
+from gs_utils.internal.utils import *
+
+
+EXPECTED = """keywords_hl 1:1 1:18
+numbers_hl 1:22 1:22
+comments_hl 1:60 1:74
+"""
+
+
+@run_test_driver
+def run_test():
+    # Test ASM file
+    asm_file = GPS.File("foo.s")
+    buf = GPS.EditorBuffer.get(asm_file)
+    yield wait_idle()
+    gps_assert(asm_file.language().lower(),
+               "asm",
+               "Wrong language for ASM file")
+    gps_assert(get_all_tags(buf),
+               EXPECTED,
+               "Issue for syntax hightlighting in ASM file")
+
+    # Test ASM2 file
+    asm2_file = GPS.File("bar.asm")
+    buf = GPS.EditorBuffer.get(asm2_file)
+    yield wait_idle()
+    gps_assert(asm2_file.language().lower(),
+               "asm2",
+               "Wrong language for ASM2 file")
+    gps_assert(get_all_tags(buf),
+               EXPECTED,
+               "Issue for syntax hightlighting in ASM2 file")

testsuite/tests/gs.292.asm_hightlighting/test.yaml

@@ -0,0 +1 @@
+title: 'gs.292.asm_hightlighting'