Merge pull request #363 from Tyriar/320_aria_attributes

Add HTML aria attribute autocomplete

Author: aeschli

src/vs/languages/html/common/htmlTags.ts

@@ -137,10 +137,13 @@ export function getHTML5TagProvider(): IHTMLTagProvider {
 		dialog: ['open:v']
 	};
 
-	var globalAttributes = ['accesskey', 'class', 'contenteditable:b', 'contextmenu', 'dir:d', 'draggable:a', 'dropzone', 'hidden:v', 'id', 'inert:v', 'itemid', 'itemprop', 'itemref', 'itemscope:v', 'itemtype',
-		'lang', 'role', 'spellcheck:b', 'style', 'tabindex', 'title', 'translate'];
-
-	// todo@Martin: aria
+	var globalAttributes = [
+		'aria-activedescendant', 'aria-atomic:b', 'aria-autocomplete:autocomplete', 'aria-busy:b', 'aria-checked:tristate', 'aria-controls', 'aria-describedby', 'aria-disabled:b',
+		'aria-dropeffect:dropeffect', 'aria-expanded:u', 'aria-flowto', 'aria-grabbed:u', 'aria-haspopup:b', 'aria-hidden:b', 'aria-invalid:invalid', 'aria-label', 'aria-labelledby',
+		'aria-level', 'aria-live:live', 'aria-multiline:b', 'aria-multiselectable:b', 'aria-orientation:orientation', 'aria-owns', 'aria-posinset', 'aria-pressed:tristate', 'aria-readonly:b',
+		'aria-relevant:relevant', 'aria-required:b', 'aria-selected:u', 'aria-setsize', 'aria-sort:sort', 'aria-valuemax', 'aria-valuemin', 'aria-valuenow', 'aria-valuetext', 'accesskey',
+		'class', 'contenteditable:b', 'contextmenu', 'dir:d', 'draggable:a', 'dropzone', 'hidden:v', 'id', 'inert:v', 'itemid', 'itemprop', 'itemref', 'itemscope:v', 'itemtype', 'lang', 'role',
+		'spellcheck:b', 'style', 'tabindex', 'title', 'translate'];
 
 	var eventHandlers = ['onabort', 'onblur', 'oncanplay', 'oncanplaythrough', 'onchange', 'onclick', 'oncontextmenu', 'ondblclick', 'ondrag', 'ondragend', 'ondragenter', 'ondragleave', 'ondragover', 'ondragstart',
 		'ondrop', 'ondurationchange', 'onemptied', 'onended', 'onerror', 'onfocus', 'onformchange', 'onforminput', 'oninput', 'oninvalid', 'onkeydown', 'onkeypress', 'onkeyup', 'onload', 'onloadeddata', 'onloadedmetadata',
@@ -150,12 +153,21 @@ export function getHTML5TagProvider(): IHTMLTagProvider {
 	var valueSets : { [tag:string]: string[]} = {
 		b: ['true', 'false'],
 		a: ['true', 'false', 'auto'],
+		u: ['true', 'false', 'undefined'],
 		d: ['ltr', 'rtl'],
 		m: ['get', 'post'],
 		o: ['on', 'off'],
 		t: ['hidden', 'text', 'search', 'tel', 'url', 'email', 'password', 'datetime', 'date', 'month', 'week', 'time', 'datetime-local', 'number', 'range', 'color', 'checkbox', 'radio', 'file', 'submit', 'image', 'reset', 'button'],
 		bt: ['button', 'submit', 'reset'],
-		xo: ['anonymous', 'use-credentials']
+		xo: ['anonymous', 'use-credentials'],
+		tristate: ['true', 'false', 'mixed', 'undefined'],
+		autocomplete: ['inline', 'list', 'both', 'none'],
+		dropeffect: ['copy', 'move', 'link', 'execute', 'popup', 'none'],
+		invalid: ['grammar', 'false', 'spelling', 'true'],
+		live: ['off', 'polite', 'assertive'],
+		orientation: ['vertical', 'horizontal'],
+		relevant: ['additions', 'removals', 'text', 'all', 'additions text'],
+		sort: ['ascending', 'descending', 'none', 'other']
 	};
 
 	return {

src/vs/languages/html/test/common/html-worker.test.ts

@@ -230,6 +230,64 @@ suite('HTML - worker', () => {
 		});
 	});
 
+	test('Intellisense aria', function(testDone): any {
+		function assertAriaAttributes(completion) {
+			assertSuggestion(completion, 'aria-activedescendant');
+			assertSuggestion(completion, 'aria-atomic');
+			assertSuggestion(completion, 'aria-autocomplete');
+			assertSuggestion(completion, 'aria-busy');
+			assertSuggestion(completion, 'aria-checked');
+			assertSuggestion(completion, 'aria-controls');
+			assertSuggestion(completion, 'aria-describedby');
+			assertSuggestion(completion, 'aria-disabled');
+			assertSuggestion(completion, 'aria-dropeffect');
+			assertSuggestion(completion, 'aria-expanded');
+			assertSuggestion(completion, 'aria-flowto');
+			assertSuggestion(completion, 'aria-grabbed');
+			assertSuggestion(completion, 'aria-haspopup');
+			assertSuggestion(completion, 'aria-hidden');
+			assertSuggestion(completion, 'aria-invalid');
+			assertSuggestion(completion, 'aria-label');
+			assertSuggestion(completion, 'aria-labelledby');
+			assertSuggestion(completion, 'aria-level');
+			assertSuggestion(completion, 'aria-live');
+			assertSuggestion(completion, 'aria-multiline');
+			assertSuggestion(completion, 'aria-multiselectable');
+			assertSuggestion(completion, 'aria-orientation');
+			assertSuggestion(completion, 'aria-owns');
+			assertSuggestion(completion, 'aria-posinset');
+			assertSuggestion(completion, 'aria-pressed');
+			assertSuggestion(completion, 'aria-readonly');
+			assertSuggestion(completion, 'aria-relevant');
+			assertSuggestion(completion, 'aria-required');
+			assertSuggestion(completion, 'aria-selected');
+			assertSuggestion(completion, 'aria-setsize');
+			assertSuggestion(completion, 'aria-sort');
+			assertSuggestion(completion, 'aria-valuemax');
+			assertSuggestion(completion, 'aria-valuemin');
+			assertSuggestion(completion, 'aria-valuenow');
+			assertSuggestion(completion, 'aria-valuetext');
+		}
+		WinJS.Promise.join([
+			testSuggestionsFor('<div  |> </div >').then((completion) => {
+				assert.equal(completion.currentWord, '');
+				assertAriaAttributes(completion);
+			}),
+
+			testSuggestionsFor('<span  |> </span >').then((completion) => {
+				assert.equal(completion.currentWord, '');
+				assertAriaAttributes(completion);
+			}),
+
+			testSuggestionsFor('<input  |> </input >').then((completion) => {
+				assert.equal(completion.currentWord, '');
+				assertAriaAttributes(completion);
+			})
+		]).done(() => testDone(), (errors:any[]) => {
+			testDone(errors.reduce((e1, e2) => e1 || e2));
+		});
+	});
+
 	test('Intellisense Angular', function(testDone): any {
 		WinJS.Promise.join([
 			testSuggestionsFor('<body  |> </body >').then((completion) => {