Skip to content

V
vscode

掘金者说 / vscode
与 Fork 源项目一致

从无法访问的项目Fork

通知 1
Star 0
Fork 0
V
vscode

体验新版 GitCode，发现更多精彩内容 >>

提交 3ba32665 编写于 作者: A Alex Dima
浏览文件
操作

More strict null sources (#60565)

上级 e6f2819b
隐藏空白更改
内联 并排
Showing with 174 addition and 103 deletion
src/tsconfig.strictNullChecks.json
浏览文件 @ 3ba32665
......@@ -6,14 +6,22 @@
},
"include": [
"./typings",
"./vs/base/browser/browser.ts",
"./vs/base/browser/event.ts",
"./vs/base/browser/history.ts",
"./vs/base/browser/iframe.ts",
"./vs/base/browser/keyboardEvent.ts",
"./vs/base/browser/mouseEvent.ts",
"./vs/base/browser/ui/octiconLabel/octiconLabel.mock.ts",
"./vs/base/browser/ui/octiconLabel/octiconLabel.ts",
"./vs/base/browser/ui/scrollbar/scrollbarState.ts",
"./vs/base/common/amd.ts",
"./vs/base/common/arrays.ts",
"./vs/base/common/assert.ts",
"./vs/base/common/async.ts",
"./vs/base/common/cancellation.ts",
"./vs/base/common/charCode.ts",
"./vs/base/common/collections.ts",
"./vs/base/common/color.ts",
"./vs/base/common/comparers.ts",
"./vs/base/common/date.ts",
......@@ -23,6 +31,9 @@
"./vs/base/common/errors.ts",
"./vs/base/common/event.ts",
"./vs/base/common/functional.ts",
"./vs/base/common/glob.ts",
"./vs/base/common/hash.ts",
"./vs/base/common/htmlContent.ts",
"./vs/base/common/idGenerator.ts",
"./vs/base/common/iterator.ts",
"./vs/base/common/jsonSchema.ts",
......@@ -30,6 +41,7 @@
"./vs/base/common/keyCodes.ts",
"./vs/base/common/lifecycle.ts",
"./vs/base/common/linkedList.ts",
"./vs/base/common/map.ts",
"./vs/base/common/marshalling.ts",
"./vs/base/common/network.ts",
"./vs/base/common/numbers.ts",
......@@ -41,6 +53,8 @@
"./vs/base/common/range.ts",
"./vs/base/common/resources.ts",
"./vs/base/common/scanCode.ts",
"./vs/base/common/scrollable.ts",
"./vs/base/common/sequence.ts",
"./vs/base/common/severity.ts",
"./vs/base/common/stopwatch.ts",
"./vs/base/common/strings.ts",
......@@ -57,7 +71,9 @@
"./vs/base/parts/contextmenu/electron-main/contextmenu.ts",
"./vs/base/parts/quickopen/common/quickOpen.ts",
"./vs/base/test/node/uri.test.perf.ts",
"./vs/base/worker/defaultWorkerFactory.ts",
"./vs/base/worker/workerMain.ts",
"./vs/editor/common/config/editorZoom.ts",
"./vs/editor/common/controller/cursorEvents.ts",
"./vs/editor/common/controller/wordCharacterClassifier.ts",
"./vs/editor/common/core/characterClassifier.ts",
......@@ -67,12 +83,13 @@
"./vs/editor/common/core/selection.ts",
"./vs/editor/common/core/stringBuilder.ts",
"./vs/editor/common/core/uint.ts",
"./vs/editor/common/model/mirrorTextModel.ts",
"./vs/editor/common/model/textModelEvents.ts",
"./vs/editor/common/view/overviewZoneManager.ts",
"./vs/editor/common/viewLayout/whitespaceComputer.ts",
"./vs/editor/common/viewModel/prefixSumComputer.ts",
"./vs/editor/common/model/mirrorTextModel.ts",
"./vs/editor/contrib/codeAction/codeActionTrigger.ts",
"./vs/editor/contrib/find/findState.ts",
"./vs/editor/contrib/find/replacePattern.ts",
"./vs/editor/contrib/indentation/indentUtils.ts",
"./vs/editor/standalone/common/monarch/monarchCommon.ts",
......@@ -81,20 +98,25 @@
"./vs/nls.mock.ts",
"./vs/platform/clipboard/common/clipboardService.ts",
"./vs/platform/clipboard/electron-browser/clipboardService.ts",
"./vs/platform/contextkey/common/contextkey.ts",
"./vs/platform/editor/common/editor.ts",
"./vs/platform/environment/common/environment.ts",
"./vs/platform/extensions/common/extensionHost.ts",
"./vs/platform/extensions/common/extensions.ts",
"./vs/platform/files/common/files.ts",
"./vs/platform/files/node/files.ts",
"./vs/platform/instantiation/common/descriptors.ts",
"./vs/platform/instantiation/common/extensions.ts",
"./vs/platform/instantiation/common/instantiation.ts",
"./vs/platform/instantiation/common/serviceCollection.ts",
"./vs/platform/integrity/common/integrity.ts",
"./vs/platform/markers/common/markers.ts",
"./vs/platform/node/package.ts",
"./vs/platform/node/product.ts",
"./vs/platform/opener/common/opener.ts",
"./vs/platform/registry/common/platform.ts",
"./vs/platform/state/common/state.ts",
"./vs/platform/theme/common/colorRegistry.ts",
"./vs/workbench/api/shared/tasks.ts",
"./vs/workbench/common/extensionHostProtocol.ts",
"./vs/workbench/parts/execution/common/execution.ts",
......
src/vs/base/browser/mouseEvent.ts
浏览文件 @ 3ba32665
......@@ -66,8 +66,8 @@ export class StandardMouseEvent implements IMouseEvent {
this.posy = e.pageY;
} else {
// Probably hit by MSGestureEvent
this.posx = e.clientX + document.body.scrollLeft + document.documentElement.scrollLeft;
this.posy = e.clientY + document.body.scrollTop + document.documentElement.scrollTop;
this.posx = e.clientX + document.body.scrollLeft + document.documentElement!.scrollLeft;
this.posy = e.clientY + document.body.scrollTop + document.documentElement!.scrollTop;
}
// Find the position of the iframe this code is executing in relative to the iframe where the event was captured.
......
src/vs/base/common/arrays.ts
浏览文件 @ 3ba32665
......@@ -138,7 +138,7 @@ function _sort<T>(a: T[], compare: Compare<T>, lo: number, hi: number, aux: T[])
export function groupBy<T>(data: T[], compare: (a: T, b: T) => number): T[][] {
const result: T[][] = [];
let currentGroup: T[];
let currentGroup: T[] | undefined = undefined;
for (const element of mergeSort(data.slice(0), compare)) {
if (!currentGroup || compare(currentGroup[0], element) !== 0) {
currentGroup = [element];
......@@ -388,7 +388,9 @@ export function firstIndex<T>(array: T[] | ReadonlyArray<T>, fn: (item: T) => bo
return -1;
}
export function first<T>(array: T[] | ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T = null): T {
export function first<T>(array: T[] | ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T): T;
export function first<T>(array: T[] | ReadonlyArray<T>, fn: (item: T) => boolean): T | null;
export function first<T>(array: T[] | ReadonlyArray<T>, fn: (item: T) => boolean, notFoundValue: T | null = null): T | null {
const index = firstIndex(array, fn);
return index < 0 ? notFoundValue : array[index];
}
......@@ -404,7 +406,7 @@ export function commonPrefixLength<T>(one: T[], other: T[], equals: (a: T, b: T)
}
export function flatten<T>(arr: T[][]): T[] {
return [].concat(...arr);
return (<T[]>[]).concat(...arr);
}
export function range(to: number): number[];
......@@ -481,15 +483,20 @@ export function arrayInsert<T>(target: T[], insertIndex: number, insertArr: T[])
* Uses Fisher-Yates shuffle to shuffle the given array
* @param array
*/
export function shuffle<T>(array: T[], seed?: number): void {
// Seeded random number generator in JS. Modified from:
// https://stackoverflow.com/questions/521295/seeding-the-random-number-generator-in-javascript
const random = () => {
var x = Math.sin(seed++) * 179426549; // throw away most significant digits and reduce any potential bias
return x - Math.floor(x);
};
const rand = typeof seed === 'number' ? random : Math.random;
export function shuffle<T>(array: T[], _seed?: number): void {
let rand: () => number;
if (typeof _seed === 'number') {
let seed = _seed;
// Seeded random number generator in JS. Modified from:
// https://stackoverflow.com/questions/521295/seeding-the-random-number-generator-in-javascript
rand = () => {
var x = Math.sin(seed++) * 179426549; // throw away most significant digits and reduce any potential bias
return x - Math.floor(x);
};
} else {
rand = Math.random;
}
for (let i = array.length - 1; i > 0; i -= 1) {
let j = Math.floor(rand() * (i + 1));
......
src/vs/base/common/async.ts
浏览文件 @ 3ba32665
......@@ -91,9 +91,9 @@ export interface ITask<T> {
*/
export class Throttler {
private activePromise: TPromise;
private queuedPromise: TPromise;
private queuedPromiseFactory: ITask<TPromise>;
private activePromise: TPromise | null;
private queuedPromise: TPromise | null;
private queuedPromiseFactory: ITask<TPromise> | null;
constructor() {
this.activePromise = null;
......@@ -109,26 +109,26 @@ export class Throttler {
const onComplete = () => {
this.queuedPromise = null;
const result = this.queue(this.queuedPromiseFactory);
const result = this.queue(this.queuedPromiseFactory!);
this.queuedPromiseFactory = null;
return result;
};
this.queuedPromise = new TPromise(c => {
this.activePromise.then(onComplete, onComplete).then(c);
this.activePromise!.then(onComplete, onComplete).then(c);
});
}
return new TPromise((c, e) => {
this.queuedPromise.then(c, e);
this.queuedPromise!.then(c, e);
});
}
this.activePromise = promiseFactory();
return new TPromise((c, e) => {
this.activePromise.then((result: any) => {
this.activePromise!.then((result: any) => {
this.activePromise = null;
c(result);
}, (err: any) => {
......@@ -175,10 +175,10 @@ export class SimpleThrottler {
export class Delayer<T> {
private timeout: any;
private completionPromise: TPromise;
private doResolve: ValueCallback;
private completionPromise: TPromise | null;
private doResolve: ValueCallback | null;
private doReject: (err: any) => void;
private task: ITask<T | TPromise<T>>;
private task: ITask<T | TPromise<T>> | null;
constructor(public defaultDelay: number) {
this.timeout = null;
......@@ -198,7 +198,7 @@ export class Delayer<T> {
}).then(() => {
this.completionPromise = null;
this.doResolve = null;
const task = this.task;
const task = this.task!;
this.task = null;
return task();
......@@ -207,7 +207,7 @@ export class Delayer<T> {
this.timeout = setTimeout(() => {
this.timeout = null;
this.doResolve(null);
this.doResolve!(null);
}, delay);
return this.completionPromise;
......@@ -363,11 +363,11 @@ export function sequence<T>(promiseFactories: ITask<Thenable<T>>[]): Promise<T[]
return Promise.resolve(null).then(thenHandler);
}
export function first<T>(promiseFactories: ITask<Thenable<T>>[], shouldStop: (t: T) => boolean = t => !!t, defaultValue: T = null): Promise<T> {
export function first<T>(promiseFactories: ITask<Thenable<T>>[], shouldStop: (t: T) => boolean = t => !!t, defaultValue: T | null = null): Promise<T | null> {
let index = 0;
const len = promiseFactories.length;
const loop: () => Promise<T> = () => {
const loop: () => Promise<T | null> = () => {
if (index >= len) {
return Promise.resolve(defaultValue);
}
......@@ -429,7 +429,7 @@ export class Limiter<T> {
private consume(): void {
while (this.outstandingPromises.length && this.runningPromises < this.maxDegreeOfParalellism) {
const iLimitedTask = this.outstandingPromises.shift();
const iLimitedTask = this.outstandingPromises.shift()!;
this.runningPromises++;
const promise = iLimitedTask.factory();
......@@ -567,7 +567,7 @@ export class IntervalTimer extends Disposable {
export class RunOnceScheduler {
protected runner: (...args: any[]) => void;
protected runner: ((...args: any[]) => void) | null;
private timeoutToken: any;
private timeout: number;
......@@ -621,7 +621,9 @@ export class RunOnceScheduler {
}
protected doRun(): void {
this.runner();
if (this.runner) {
this.runner();
}
}
}
......@@ -644,7 +646,9 @@ export class RunOnceWorker<T> extends RunOnceScheduler {
const units = this.units;
this.units = [];
this.runner(units);
if (this.runner) {
this.runner(units);
}
}
dispose(): void {
......@@ -689,12 +693,30 @@ declare function cancelIdleCallback(handle: number): void;
});
runWhenIdle = (runner, timeout = 0) => {
let handle = setTimeout(() => runner(dummyIdle), timeout);
return { dispose() { clearTimeout(handle); handle = undefined; } };
let disposed = false;
return {
dispose() {
if (disposed) {
return;
}
disposed = true;
clearTimeout(handle);
}
};
};
} else {
runWhenIdle = (runner, timeout?) => {
let handle = requestIdleCallback(runner, typeof timeout === 'number' ? { timeout } : undefined);
return { dispose() { cancelIdleCallback(handle); handle = undefined; } };
let handle: number = requestIdleCallback(runner, typeof timeout === 'number' ? { timeout } : undefined);
let disposed = false;
return {
dispose() {
if (disposed) {
return;
}
disposed = true;
cancelIdleCallback(handle);
}
};
};
}
})();
......
src/vs/base/common/cancellation.ts
浏览文件 @ 3ba32665
......@@ -51,7 +51,7 @@ export namespace CancellationToken {
class MutableToken implements CancellationToken {
private _isCancelled: boolean = false;
private _emitter: Emitter<any>;
private _emitter: Emitter<any> | null = null;
public cancel() {
if (!this._isCancelled) {
......@@ -80,7 +80,7 @@ class MutableToken implements CancellationToken {
public dispose(): void {
if (this._emitter) {
this._emitter.dispose();
this._emitter = undefined;
this._emitter = null;
}
}
}
......
src/vs/base/common/collections.ts
浏览文件 @ 3ba32665
......@@ -45,7 +45,7 @@ export function size<T>(from: IStringDictionary<T> | INumberDictionary<T>): numb
return count;
}
export function first<T>(from: IStringDictionary<T> | INumberDictionary<T>): T {
export function first<T>(from: IStringDictionary<T> | INumberDictionary<T>): T | undefined {
for (let key in from) {
if (hasOwnProperty.call(from, key)) {
return from[key];
......
src/vs/base/common/glob.ts
浏览文件 @ 3ba32665
......@@ -248,7 +248,7 @@ const T5 = /^([\w\.-]+(\/[\w\.-]+)*)\/?$/; // something/else
export type ParsedPattern = (path: string, basename?: string) => boolean;
// The ParsedExpression returns a Promise iff hasSibling returns a Promise.
export type ParsedExpression = (path: string, basename?: string, hasSibling?: (name: string) => boolean | TPromise<boolean>) => string | TPromise<string> /* the matching pattern */;
export type ParsedExpression = (path: string, basename?: string, hasSibling?: (name: string) => boolean | TPromise<boolean>) => string | null | TPromise<string | null> /* the matching pattern */;
export interface IGlobOptions {
/**
......@@ -258,14 +258,14 @@ export interface IGlobOptions {
}
interface ParsedStringPattern {
(path: string, basename: string): string | TPromise<string> /* the matching pattern */;
(path: string, basename: string): string | null | TPromise<string | null> /* the matching pattern */;
basenames?: string[];
patterns?: string[];
allBasenames?: string[];
allPaths?: string[];
}
interface ParsedExpressionPattern {
(path: string, basename: string, name: string, hasSibling: (name: string) => boolean | TPromise<boolean>): string | TPromise<string> /* the matching pattern */;
(path: string, basename: string, name?: string, hasSibling?: (name: string) => boolean | TPromise<boolean>): string | null | TPromise<string | null> /* the matching pattern */;
requiresSiblings?: boolean;
allBasenames?: string[];
allPaths?: string[];
......@@ -277,7 +277,7 @@ const FALSE = function () {
return false;
};
const NULL = function (): string {
const NULL = function (): string | null {
return null;
};
......@@ -305,7 +305,7 @@ function parsePattern(arg1: string | IRelativePattern, options: IGlobOptions): P
}
// Check for Trivias
let match: RegExpExecArray;
let match: RegExpExecArray | null;
if (T1.test(pattern)) { // common pattern: **/*.txt just need endsWith check
const base = pattern.substr(4); // '**/*'.length === 4
parsedPattern = function (path, basename) {
......@@ -530,7 +530,7 @@ export function isRelativePattern(obj: any): obj is IRelativePattern {
*/
export function parseToAsync(expression: IExpression, options?: IGlobOptions): ParsedExpression {
const parsedExpression = parse(expression, options);
return (path: string, basename?: string, hasSibling?: (name: string) => boolean | TPromise<boolean>): string | TPromise<string> => {
return (path: string, basename?: string, hasSibling?: (name: string) => boolean | TPromise<boolean>): string | null | TPromise<string | null> => {
const result = parsedExpression(path, basename, hasSibling);
return result instanceof TPromise ? result : TPromise.as(result);
};
......@@ -554,7 +554,7 @@ function parsedExpression(expression: IExpression, options: IGlobOptions): Parse
return NULL;
}
if (!parsedPatterns.some(parsedPattern => (<ParsedExpressionPattern>parsedPattern).requiresSiblings)) {
if (!parsedPatterns.some(parsedPattern => !!(<ParsedExpressionPattern>parsedPattern).requiresSiblings)) {
if (n === 1) {
return <ParsedStringPattern>parsedPatterns[0];
}
......@@ -585,7 +585,7 @@ function parsedExpression(expression: IExpression, options: IGlobOptions): Parse
}
const resultExpression: ParsedStringPattern = function (path: string, basename: string, hasSibling?: (name: string) => boolean | TPromise<boolean>) {
let name: string;
let name: string | undefined = undefined;
for (let i = 0, n = parsedPatterns.length; i < n; i++) {
// Pattern matches path
......@@ -665,7 +665,10 @@ function aggregateBasenameMatches(parsedPatterns: (ParsedStringPattern | ParsedE
return parsedPatterns;
}
const basenames = basenamePatterns.reduce<string[]>((all, current) => all.concat((<ParsedStringPattern>current).basenames), []);
const basenames = basenamePatterns.reduce<string[]>((all, current) => {
const basenames = (<ParsedStringPattern>current).basenames;
return basenames ? all.concat(basenames) : all;
}, <string[]>[]);
let patterns: string[];
if (result) {
patterns = [];
......@@ -673,7 +676,10 @@ function aggregateBasenameMatches(parsedPatterns: (ParsedStringPattern | ParsedE
patterns.push(result);
}
} else {
patterns = basenamePatterns.reduce((all, current) => all.concat((<ParsedStringPattern>current).patterns), []);
patterns = basenamePatterns.reduce((all, current) => {
const patterns = (<ParsedStringPattern>current).patterns;
return patterns ? all.concat(patterns) : all;
}, <string[]>[]);
}
const aggregate: ParsedStringPattern = function (path, basename) {
if (!path) {
......
src/vs/base/common/hash.ts
浏览文件 @ 3ba32665
......@@ -22,9 +22,9 @@ export function hash(obj: any, hashVal = 0): number {
case 'number':
return numberHash(obj, hashVal);
case 'undefined':
return numberHash(obj, 937);
return numberHash(0, 937);
default:
return numberHash(obj, 617);
return numberHash(0, 617);
}
}
......
src/vs/base/common/map.ts
浏览文件 @ 3ba32665
......@@ -139,11 +139,11 @@ export class PathIterator implements IKeyIterator {
class TernarySearchTreeNode<E> {
segment: string;
value: E;
value: E | undefined;
key: string;
left: TernarySearchTreeNode<E>;
mid: TernarySearchTreeNode<E>;
right: TernarySearchTreeNode<E>;
left: TernarySearchTreeNode<E> | undefined;
mid: TernarySearchTreeNode<E> | undefined;
right: TernarySearchTreeNode<E> | undefined;
isEmpty(): boolean {
return !this.left && !this.mid && !this.right && !this.value;
......@@ -161,7 +161,7 @@ export class TernarySearchTree<E> {
}
private _iter: IKeyIterator;
private _root: TernarySearchTreeNode<E>;
private _root: TernarySearchTreeNode<E> | undefined;
constructor(segments: IKeyIterator) {
this._iter = segments;
......@@ -171,7 +171,7 @@ export class TernarySearchTree<E> {
this._root = undefined;
}
set(key: string, element: E): E {
set(key: string, element: E): E | undefined {
let iter = this._iter.reset(key);
let node: TernarySearchTreeNode<E>;
......@@ -217,7 +217,7 @@ export class TernarySearchTree<E> {
return oldElement;
}
get(key: string): E {
get(key: string): E | undefined {
let iter = this._iter.reset(key);
let node = this._root;
while (node) {
......@@ -267,7 +267,7 @@ export class TernarySearchTree<E> {
// clean up empty nodes
while (stack.length > 0 && node.isEmpty()) {
let [dir, parent] = stack.pop();
let [dir, parent] = stack.pop()!;
switch (dir) {
case 1: parent.left = undefined; break;
case 0: parent.mid = undefined; break;
......@@ -280,10 +280,10 @@ export class TernarySearchTree<E> {
}
}
findSubstr(key: string): E {
findSubstr(key: string): E | undefined {
let iter = this._iter.reset(key);
let node = this._root;
let candidate: E;
let candidate: E | undefined = undefined;
while (node) {
let val = iter.cmp(node.segment);
if (val > 0) {
......@@ -304,7 +304,7 @@ export class TernarySearchTree<E> {
return node && node.value || candidate;
}
findSuperstr(key: string): Iterator<E> {
findSuperstr(key: string): Iterator<E> | undefined {
let iter = this._iter.reset(key);
let node = this._root;
while (node) {
......@@ -360,7 +360,7 @@ export class TernarySearchTree<E> {
this._forEach(this._root, callback);
}
private _forEach(node: TernarySearchTreeNode<E>, callback: (value: E, index: string) => any) {
private _forEach(node: TernarySearchTreeNode<E> | undefined, callback: (value: E, index: string) => any) {
if (node) {
// left
this._forEach(node.left, callback);
......@@ -639,11 +639,11 @@ export class LinkedMap<K, V> {
this.clear();
return;
}
let current = this._head;
let current = this._head!;
let currentSize = this.size;
while (current && currentSize > newSize) {
this._map.delete(current.key);
current = current.next;
current = current.next!;
currentSize--;
}
this._head = current;
......
src/vs/base/common/scrollable.ts
浏览文件 @ 3ba32665
......@@ -182,7 +182,7 @@ export class Scrollable extends Disposable {
private _smoothScrollDuration: number;
private readonly _scheduleAtNextAnimationFrame: (callback: () => void) => IDisposable;
private _state: ScrollState;
private _smoothScrolling: SmoothScrollingOperation;
private _smoothScrolling: SmoothScrollingOperation | null;
private _onScroll = this._register(new Emitter<ScrollEvent>());
public readonly onScroll: Event<ScrollEvent> = this._onScroll.event;
......@@ -300,6 +300,9 @@ export class Scrollable extends Disposable {
}
private _performSmoothScrolling(): void {
if (!this._smoothScrolling) {
return;
}
const update = this._smoothScrolling.tick();
const newState = this._state.withScrollPosition(update);
......@@ -372,7 +375,7 @@ export class SmoothScrollingOperation {
public to: ISmoothScrollPosition;
public readonly duration: number;
private readonly _startTime: number;
public animationFrameDisposable: IDisposable;
public animationFrameDisposable: IDisposable | null;
private scrollLeft: IAnimation;
private scrollTop: IAnimation;
......
src/vs/base/worker/defaultWorkerFactory.ts
浏览文件 @ 3ba32665
......@@ -31,7 +31,7 @@ function getWorker(workerId: string, label: string): Worker {
class WebWorker implements IWorker {
private id: number;
private worker: Worker;
private worker: Worker | null;
constructor(moduleId: string, id: number, label: string, onMessageCallback: IWorkerCallback, onErrorCallback: (err: any) => void) {
this.id = id;
......@@ -56,7 +56,9 @@ class WebWorker implements IWorker {
}
public dispose(): void {
this.worker.terminate();
if (this.worker) {
this.worker.terminate();
}
this.worker = null;
}
}
......
src/vs/editor/common/core/range.ts
浏览文件 @ 3ba32665
......@@ -223,7 +223,7 @@ export class Range {
/**
* Test if range `a` equals `b`.
*/
public static equalsRange(a: IRange, b: IRange): boolean {
public static equalsRange(a: IRange | null, b: IRange | null): boolean {
return (
!!a &&
!!b &&
......
src/vs/editor/contrib/find/findState.ts
浏览文件 @ 3ba32665
......@@ -65,10 +65,10 @@ export class FindReplaceState implements IDisposable {
private _wholeWordOverride: FindOptionOverride;
private _matchCase: boolean;
private _matchCaseOverride: FindOptionOverride;
private _searchScope: Range;
private _searchScope: Range | null;
private _matchesPosition: number;
private _matchesCount: number;
private _currentMatch: Range;
private _currentMatch: Range | null;
private readonly _onFindReplaceStateChange: Emitter<FindReplaceStateChangedEvent>;
public get searchString(): string { return this._searchString; }
......@@ -83,10 +83,10 @@ export class FindReplaceState implements IDisposable {
public get actualWholeWord(): boolean { return this._wholeWord; }
public get actualMatchCase(): boolean { return this._matchCase; }
public get searchScope(): Range { return this._searchScope; }
public get searchScope(): Range | null { return this._searchScope; }
public get matchesPosition(): number { return this._matchesPosition; }
public get matchesCount(): number { return this._matchesCount; }
public get currentMatch(): Range { return this._currentMatch; }
public get currentMatch(): Range | null { return this._currentMatch; }
public get onFindReplaceStateChange(): Event<FindReplaceStateChangedEvent> { return this._onFindReplaceStateChange.event; }
constructor() {
......
src/vs/monaco.d.ts
浏览文件 @ 3ba32665
......@@ -624,7 +624,7 @@ declare namespace monaco {
/**
* Test if range `a` equals `b`.
*/
static equalsRange(a: IRange, b: IRange): boolean;
static equalsRange(a: IRange | null, b: IRange | null): boolean;
/**
* Return the end position (which will be after or equal to the start position)
*/
......
src/vs/platform/contextkey/common/contextkey.ts
浏览文件 @ 3ba32665
......@@ -42,7 +42,7 @@ export abstract class ContextKeyExpr {
return new ContextKeyAndExpr(expr);
}
public static deserialize(serialized: string): ContextKeyExpr {
public static deserialize(serialized: string): ContextKeyExpr | null {
if (!serialized) {
return null;
}
......@@ -96,7 +96,7 @@ export abstract class ContextKeyExpr {
return serializedValue;
}
private static _deserializeRegexValue(serializedValue: string): RegExp {
private static _deserializeRegexValue(serializedValue: string): RegExp | null {
if (isFalsyOrWhitespace(serializedValue)) {
console.warn('missing regexp-value for =~-expression');
......@@ -123,7 +123,7 @@ export abstract class ContextKeyExpr {
public abstract getType(): ContextKeyExprType;
public abstract equals(other: ContextKeyExpr): boolean;
public abstract evaluate(context: IContext): boolean;
public abstract normalize(): ContextKeyExpr;
public abstract normalize(): ContextKeyExpr | null;
public abstract serialize(): string;
public abstract keys(): string[];
}
......@@ -358,7 +358,7 @@ export class ContextKeyNotExpr implements ContextKeyExpr {
export class ContextKeyRegexExpr implements ContextKeyExpr {
constructor(private key: string, private regexp: RegExp) {
constructor(private key: string, private regexp: RegExp | null) {
//
}
......@@ -373,11 +373,12 @@ export class ContextKeyRegexExpr implements ContextKeyExpr {
if (this.key > other.key) {
return 1;
}
const source = this.regexp ? this.regexp.source : undefined;
if (source < other.regexp.source) {
const thisSource = this.regexp ? this.regexp.source : '';
const otherSource = other.regexp ? other.regexp.source : '';
if (thisSource < otherSource) {
return -1;
}
if (source > other.regexp.source) {
if (thisSource > otherSource) {
return 1;
}
return 0;
......@@ -385,8 +386,9 @@ export class ContextKeyRegexExpr implements ContextKeyExpr {
public equals(other: ContextKeyExpr): boolean {
if (other instanceof ContextKeyRegexExpr) {
const source = this.regexp ? this.regexp.source : undefined;
return (this.key === other.key && source === other.regexp.source);
const thisSource = this.regexp ? this.regexp.source : '';
const otherSource = other.regexp ? other.regexp.source : '';
return (this.key === other.key && thisSource === otherSource);
}
return false;
}
......@@ -451,7 +453,7 @@ export class ContextKeyAndExpr implements ContextKeyExpr {
if (arr) {
for (let i = 0, len = arr.length; i < len; i++) {
let e = arr[i];
let e: ContextKeyExpr | null = arr[i];
if (!e) {
continue;
}
......@@ -475,7 +477,7 @@ export class ContextKeyAndExpr implements ContextKeyExpr {
return expr;
}
public normalize(): ContextKeyExpr {
public normalize(): ContextKeyExpr | null {
if (this.expr.length === 0) {
return null;
}
......@@ -492,7 +494,11 @@ export class ContextKeyAndExpr implements ContextKeyExpr {
return '';
}
if (this.expr.length === 1) {
return this.normalize().serialize();
const normalized = this.normalize();
if (!normalized) {
return '';
}
return normalized.serialize();
}
return this.expr.map(e => e.serialize()).join(' && ');
}
......
src/vs/platform/files/common/files.ts
浏览文件 @ 3ba32665
......@@ -236,7 +236,7 @@ export class FileOperationEvent {
return this._resource;
}
get target(): IFileStat {
get target(): IFileStat | undefined {
return this._target;
}
......@@ -484,12 +484,15 @@ export interface IStringStream {
* Will return null when finished.
*/
export interface ITextSnapshot {
read(): string;
read(): string | null;
}
export class StringSnapshot implements ITextSnapshot {
constructor(private _value: string) { }
read(): string {
private _value: string | null;
constructor(value: string) {
this._value = value;
}
read(): string | null {
let ret = this._value;
this._value = null;
return ret;
......@@ -500,7 +503,7 @@ export class StringSnapshot implements ITextSnapshot {
*/
export function snapshotToString(snapshot: ITextSnapshot): string {
const chunks: string[] = [];
let chunk: string;
let chunk: string | null;
while (typeof (chunk = snapshot.read()) === 'string') {
chunks.push(chunk);
}
......
src/vs/platform/theme/common/colorRegistry.ts
浏览文件 @ 3ba32665
......@@ -19,18 +19,18 @@ export interface ColorContribution {
readonly description: string;
readonly defaults: ColorDefaults;
readonly needsTransparency: boolean;
readonly deprecationMessage: string;
readonly deprecationMessage: string | undefined;
}
export interface ColorFunction {
(theme: ITheme): Color;
(theme: ITheme): Color | null;
}
export interface ColorDefaults {
light: ColorValue;
dark: ColorValue;
hc: ColorValue;
light: ColorValue | null;
dark: ColorValue | null;
hc: ColorValue | null;
}
/**
......@@ -61,7 +61,7 @@ export interface IColorRegistry {
/**
* Gets the default color of the given id
*/
resolveDefaultColor(id: ColorIdentifier, theme: ITheme): Color;
resolveDefaultColor(id: ColorIdentifier, theme: ITheme): Color | null;
/**
* JSON schema for an object to assign color values to one of the color contrbutions.
......@@ -93,9 +93,9 @@ class ColorRegistry implements IColorRegistry {
if (deprecationMessage) {
propertySchema.deprecationMessage = deprecationMessage;
}
this.colorSchema.properties[id] = propertySchema;
this.colorReferenceSchema.enum.push(id);
this.colorReferenceSchema.enumDescriptions.push(description);
this.colorSchema.properties![id] = propertySchema;
this.colorReferenceSchema.enum!.push(id);
this.colorReferenceSchema.enumDescriptions!.push(description);
return id;
}
......@@ -103,7 +103,7 @@ class ColorRegistry implements IColorRegistry {
return Object.keys(this.colorsById).map(id => this.colorsById[id]);
}
public resolveDefaultColor(id: ColorIdentifier, theme: ITheme): Color {
public resolveDefaultColor(id: ColorIdentifier, theme: ITheme): Color | null {
let colorDesc = this.colorsById[id];
if (colorDesc && colorDesc.defaults) {
let colorValue = colorDesc.defaults[theme.type];
......@@ -412,7 +412,7 @@ function lessProminent(colorValue: ColorValue, backgroundColorValue: ColorValue,
/**
* @param colorValue Resolve a color value in the context of a theme
*/
function resolveColorValue(colorValue: ColorValue, theme: ITheme): Color {
function resolveColorValue(colorValue: ColorValue | null, theme: ITheme): Color | null {
if (colorValue === null) {
return null;
} else if (typeof colorValue === 'string') {
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或