javascript/NativeScript
1
0
Fork 0
mirror of https://github.com/NativeScript/NativeScript.git synced 2025-11-05 13:26:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Handle TS2.7 stricter tuples checks (#5366)

Browse Source
This commit is contained in:
Alexander Vakrilov
2018-02-01 13:04:55 +02:00
committed by GitHub
parent c66a3fb3a7
commit c0a7a45ab9
3 changed files with 49 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tns-core-modules/css/parser.ts
View File

@@ -342,7 +342,7 @@ export function parseAngle(value: string, start: number = 0): Parsed<Angle> {
const angleResult = parseUnit(value, start);
if (angleResult) {
const { start, end, value } = angleResult;
return (angleUnitsToRadMap[value.unit] || (() => null))(start, end, value.value);
return (angleUnitsToRadMap[value.unit] || ((_,__,___) => null))(start, end, value.value);
}
return null;
}
@@ -693,7 +693,8 @@ export interface AttributeSelector {
export type SimpleSelector = UniversalSelector | TypeSelector | ClassSelector | IdSelector | PseudoClassSelector | AttributeSelector;
export type SimpleSelectorSequence = SimpleSelector[];
export type Selector = [SimpleSelectorSequence, Combinator];
export type SelectorCombinatorPair = [SimpleSelectorSequence, Combinator];
export type Selector = SelectorCombinatorPair[];
const universalSelectorRegEx = /\*/gy;
export function parseUniversalSelector(text: string, start: number = 0): Parsed<UniversalSelector> {
@@ -781,6 +782,7 @@ export function parseSelector(text: string, start: number = 0): Parsed<Selector>
let value = <Selector>[];
let combinator: Parsed<Combinator>;
let expectSimpleSelector = true; // Must have at least one
let pair = <SelectorCombinatorPair>[];
do {
const simpleSelectorSequence = parseSimpleSelectorSequence(text, end);
if (!simpleSelectorSequence) {
@@ -792,16 +794,17 @@ export function parseSelector(text: string, start: number = 0): Parsed<Selector>
}
end = simpleSelectorSequence.end;
if (combinator) {
value.push(combinator.value);
pair[1] = combinator.value;
}
value.push(simpleSelectorSequence.value);
pair = [simpleSelectorSequence.value, undefined]
value.push(pair)
combinator = parseCombinator(text, end);
if (combinator) {
end = combinator.end;
}
expectSimpleSelector = combinator && combinator.value !== " "; // Simple selector must follow non trailing white space combinator
} while(combinator);
value.push(undefined);
return { start, end, value };
}