@@ -120,14 +120,10 @@ scopes:
   '"while"': 'keyword.control'
   '"in"': 'keyword.control'
   '"until"': 'keyword.control'
-  '"alias"': 'keyword.control'
   '"defined?"': 'keyword.control'
-  '"redo"': 'keyword.control'
-  '"super"': 'keyword.control'
+  '"alias"': 'keyword.control'
   '"undef"': 'keyword.control'
-  '"alias_method"': 'keyword.control'
-  '"block_given?"': 'keyword.control'
-  '"iterator?"': 'keyword.control'
+  'super': 'keyword.control'
 
   'interpolation': 'embedded.source'
   'interpolation > "#{"': 'punctuation.section.embedded'
@@ -149,6 +145,10 @@ scopes:
       match: '^(public|protected|private)$'
       scopes: 'keyword.other.special-method'
     }
+    {
+      match: '^(block_given\?|iterator\?|alias_method|redo)'
+      scopes: 'keyword.control'
+    }
   ]
 
   'escape_sequence': 'constant.character.escape'
@@ -167,6 +167,7 @@ scopes:
   'method_call > identifier:nth-child(0)': [
     {exact: 'require', scopes: 'support.function'}
     {match: '^(public|protected|private)$', scopes: 'keyword.other.special-method'}
+    {match: '^(block_given\?|iterator\?|alias_method|redo)', scopes: 'keyword.control'}
     'entity.name.function'
   ]
 
 
@@ -55,4 +55,60 @@ describe('Tree-sitter Ruby grammar', () => {
       '.source.ruby .keyword.other.special-method'
     )
   })
+
+  it('tokenizes keyword predicates', async () => {
+    const editor = await atom.workspace.open('foo.rb')
+
+    editor.setText(dedent`
+      defined?(:thing)
+      block_given?
+      iterator?
+    `)
+
+    expect(editor.scopeDescriptorForBufferPosition([0, 0]).toString()).toBe(
+      '.source.ruby .keyword.control'
+    )
+    expect(editor.scopeDescriptorForBufferPosition([1, 0]).toString()).toBe(
+      '.source.ruby .keyword.control'
+    )
+    expect(editor.scopeDescriptorForBufferPosition([2, 0]).toString()).toBe(
+      '.source.ruby .keyword.control'
+    )
+  })
+
+  it('tokenizes alias definitions', async () => {
+    const editor = await atom.workspace.open('foo.rb')
+
+    editor.setText(dedent`
+      alias_method :name, :full_name
+      alias name full_name
+    `)
+
+    expect(editor.scopeDescriptorForBufferPosition([0, 0]).toString()).toBe(
+      '.source.ruby .keyword.control'
+    )
+    expect(editor.scopeDescriptorForBufferPosition([1, 0]).toString()).toBe(
+      '.source.ruby .keyword.control'
+    )
+  })
+
+  it('tokenizes keywords', async () => {
+    const editor = await atom.workspace.open('foo.rb')
+
+    editor.setText(dedent`
+      undef
+      redo
+      super
+    `)
+
+    expect(editor.scopeDescriptorForBufferPosition([0, 0]).toString()).toBe(
+      '.source.ruby .keyword.control'
+    )
+    expect(editor.scopeDescriptorForBufferPosition([1, 0]).toString()).toBe(
+      '.source.ruby .keyword.control'
+    )
+    expect(editor.scopeDescriptorForBufferPosition([2, 0]).toString()).toBe(
+      '.source.ruby .keyword.control'
+    )
+  })
 })