Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-04-29 13:03:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'Microsoft/master' into update-css-intellisense

Browse Source
This commit is contained in:
David Storey
2015-11-23 19:22:15 -08:00
parent 578b93e3f9 d801f13d11
commit 70208296a0
81 changed files with 1448 additions and 1163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/vs/languages/css/common/services/browsers.js
View File

@@ -1,8 +1,10 @@
/*---------------------------------------------------------
* Copyright (C) Microsoft Corporation. All rights reserved.
*---------------------------------------------------------*/
/*---------------------------------------------------------------------------------------------
* Copyright (c) Microsoft Corporation. All rights reserved.
* Licensed under the MIT License. See License.txt in the project root for license information.
*--------------------------------------------------------------------------------------------*/
// file generated from css-schema.xml using css-exclude_generate_browserjs.js
define(["require", "exports"], function(require, exports) {
define(["require", "exports"], function(require, exports) {
exports.data ={
"css": {

8
src/vs/languages/css/common/services/languageFacts.ts
View File

@@ -194,7 +194,7 @@ export var colorKeywords : { [name:string]:string } = {
};
export var units : { [unitName:string]:string[] } = {
'length': ['em', 'rem', 'ex', 'px', 'cm', 'mm', 'in', 'pt', 'pc', 'ch', 'vw', 'vh', 'vmin', 'vmax'],
'length': ['em', 'rem', 'ex', 'px', 'cm', 'mm', 'in', 'pt', 'pc', 'ch', 'vw', 'vh', 'vmin', 'vmax'],
'angle': ['deg', 'rad', 'grad', 'turn'],
'time': ['ms', 's'],
'frequency': ['Hz', 'kHz'],
@@ -206,7 +206,7 @@ export var html5Tags = ['a', 'abbr', 'address', 'area', 'article', 'aside', 'aud
'cite', 'code', 'col', 'colgroup', 'data', 'datalist', 'dd', 'del', 'details', 'dfn', 'dialog', 'div', 'dl', 'dt', 'em', 'embed', 'fieldset', 'figcaption', 'figure', 'footer',
'form', 'h1', 'h2', 'h3', 'h4', 'h5', 'h6', 'head', 'header', 'hgroup', 'hr', 'html', 'i', 'iframe', 'img', 'input', 'ins', 'kbd', 'keygen', 'label', 'legend', 'li', 'link',
'main', 'map', 'mark', 'menu', 'menuitem', 'meta', 'meter', 'nav', 'noscript', 'object', 'ol', 'optgroup', 'option', 'output', 'p', 'param', 'pre', 'progress', 'q', 'rb',
'rp', 'rt', 'rtc', 'ruby', 's', 'samp', 'script', 'section', 'select', 'small', 'source', 'span', 'strong', 'style', 'sub', 'summary', 'sup', 'table', 'tbody', 'td', 'template',
'rp', 'rt', 'rtc', 'ruby', 's', 'samp', 'script', 'section', 'select', 'small', 'source', 'span', 'strong', 'style', 'sub', 'summary', 'sup', 'svg', 'table', 'tbody', 'td', 'template',
'textarea', 'tfoot', 'th', 'thead', 'time', 'title', 'tr', 'track', 'u', 'ul', 'var', 'video', 'wbr' ];
export function isColorConstructor(node:nodes.Function): boolean {
@@ -302,6 +302,7 @@ export function getBrowserLabel(b: Browsers): string {
}
export interface Browsers {
E:string;
FF:string;
IE:string;
O:string;
@@ -326,7 +327,7 @@ export interface IEntry {
}
function evalBrowserEntry(browsers: string) {
var browserEntry : Browsers = { all: false, FF: '', S: '', C: '', IE: '', O: '', count: 0};
var browserEntry : Browsers = { all: false, E: '', FF: '', S: '', C: '', IE: '', O: '', count: 0};
var count = 0;
if (browsers) {
browsers.split(',').forEach(
@@ -474,6 +475,7 @@ export function getPseudoClasses(): IEntry[]{
}
export var browserNames = {
E : 'Edge',
FF : 'Firefox',
S : 'Safari',
C : 'Chrome',