Skip to content

Commit 4c4edce

Browse files
mjbvzmjbvz
committed
Fixing more TS 3.7 related compile errors
- Import aliasing symbol in file - Missing function calls in conditional - Missing return statement
1 parent 2b4638e commit 4c4edce

9 files changed

Lines changed: 14 additions & 15 deletions

File tree

‎extensions/git/src/util.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ export async function mkdirp(path: string, mode?: number): Promise<boolean> {
160160
if (err.code === 'EEXIST') {
161161
const stat = await nfcall<fs.Stats>(fs.stat, path);
162162

163-
if (stat.isDirectory) {
163+
if (stat.isDirectory()) {
164164
return;
165165
}
166166

‎src/vs/base/browser/ui/grid/grid.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import { Disposable } from 'vs/base/common/lifecycle';
99
import { tail2 as tail, equals } from 'vs/base/common/arrays';
1010
import { orthogonal, IView as IGridViewView, GridView, Sizing as GridViewSizing, Box, IGridViewStyles, IViewSize, IGridViewOptions } from './gridview';
1111
import { Event } from 'vs/base/common/event';
12-
import { InvisibleSizing } from 'vs/base/browser/ui/splitview/splitview';
1312

1413
export { Orientation, Sizing as GridViewSizing, IViewSize, orthogonal, LayoutPriority } from './gridview';
1514

‎src/vs/base/parts/ipc/common/ipc.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ import { IDisposable, toDisposable, combinedDisposable } from 'vs/base/common/li
88
import { CancelablePromise, createCancelablePromise, timeout } from 'vs/base/common/async';
99
import { CancellationToken, CancellationTokenSource } from 'vs/base/common/cancellation';
1010
import * as errors from 'vs/base/common/errors';
11-
import { IServerChannel, IChannel } from 'vs/base/parts/ipc/common/ipc';
1211
import { VSBuffer } from 'vs/base/common/buffer';
1312

1413
/**

‎src/vs/editor/browser/controller/mouseTarget.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -972,7 +972,7 @@ export class MouseTargetFactory {
972972

973973
// Thank you browsers for making this so 'easy' :)
974974

975-
if (document.caretRangeFromPoint) {
975+
if (typeof document.caretRangeFromPoint === 'function') {
976976

977977
return this._doHitTestWithCaretRangeFromPoint(ctx, request);
978978

‎src/vs/editor/browser/editorExtensions.ts‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,17 @@ import { ITextModelService } from 'vs/editor/common/services/resolverService';
1616
import { MenuId, MenuRegistry } from 'vs/platform/actions/common/actions';
1717
import { CommandsRegistry, ICommandHandlerDescription } from 'vs/platform/commands/common/commands';
1818
import { ContextKeyExpr, IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
19-
import { IConstructorSignature1, ServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
19+
import { IConstructorSignature1, ServicesAccessor as InstantiationServicesAccessor } from 'vs/platform/instantiation/common/instantiation';
2020
import { IKeybindings, KeybindingsRegistry } from 'vs/platform/keybinding/common/keybindingsRegistry';
2121
import { Registry } from 'vs/platform/registry/common/platform';
2222
import { ITelemetryService } from 'vs/platform/telemetry/common/telemetry';
2323
import { withNullAsUndefined } from 'vs/base/common/types';
2424

25-
export type ServicesAccessor = ServicesAccessor;
25+
export type ServicesAccessor = InstantiationServicesAccessor;
2626
export type IEditorContributionCtor = IConstructorSignature1<ICodeEditor, IEditorContribution>;
2727
export type EditorTelemetryDataFragment = {
28-
target: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
29-
snippet: { classification: 'SystemMetaData', purpose: 'FeatureInsight', isMeasurement: true };
28+
target: { classification: 'SystemMetaData', purpose: 'FeatureInsight', };
29+
snippet: { classification: 'SystemMetaData', purpose: 'FeatureInsight', isMeasurement: true, };
3030
};
3131

3232
//#region Command
@@ -224,8 +224,8 @@ export abstract class EditorAction extends EditorCommand {
224224

225225
protected reportTelemetry(accessor: ServicesAccessor, editor: ICodeEditor) {
226226
type EditorActionInvokedClassification = {
227-
name: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
228-
id: { classification: 'SystemMetaData', purpose: 'FeatureInsight' };
227+
name: { classification: 'SystemMetaData', purpose: 'FeatureInsight', };
228+
id: { classification: 'SystemMetaData', purpose: 'FeatureInsight', };
229229
};
230230
type EditorActionInvokedEvent = {
231231
name: string;
@@ -241,7 +241,7 @@ export abstract class EditorAction extends EditorCommand {
241241

242242
// --- Registration of commands and actions
243243

244-
export function registerLanguageCommand<Args extends { [n: string]: any }>(id: string, handler: (accessor: ServicesAccessor, args: Args) => any) {
244+
export function registerLanguageCommand<Args extends { [n: string]: any; }>(id: string, handler: (accessor: ServicesAccessor, args: Args) => any) {
245245
CommandsRegistry.registerCommand(id, (accessor, args) => handler(accessor, args || {}));
246246
}
247247

‎src/vs/editor/common/modes/languageConfiguration.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ export class StandardAutoClosingPairConditional {
247247

248248
if (Array.isArray(source.notIn)) {
249249
for (let i = 0, len = source.notIn.length; i < len; i++) {
250-
let notIn = source.notIn[i];
250+
const notIn: string = source.notIn[i];
251251
switch (notIn) {
252252
case 'string':
253253
this._standardTokenMask |= StandardTokenType.String;

‎src/vs/workbench/common/views.ts‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import { Command } from 'vs/editor/common/modes';
77
import { UriComponents } from 'vs/base/common/uri';
88
import { Event, Emitter } from 'vs/base/common/event';
99
import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
10-
import { ITreeViewDataProvider } from 'vs/workbench/common/views';
1110
import { localize } from 'vs/nls';
1211
import { IViewlet } from 'vs/workbench/common/viewlet';
1312
import { createDecorator } from 'vs/platform/instantiation/common/instantiation';

‎src/vs/workbench/contrib/files/common/files.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import { URI } from 'vs/base/common/uri';
77
import { IEditorOptions } from 'vs/editor/common/config/editorOptions';
88
import { IWorkbenchEditorConfiguration, IEditorIdentifier, IEditorInput, toResource, SideBySideEditor } from 'vs/workbench/common/editor';
9-
import { IFilesConfiguration, FileChangeType, IFileService } from 'vs/platform/files/common/files';
9+
import { IFilesConfiguration as PlatformIFilesConfiguration, FileChangeType, IFileService } from 'vs/platform/files/common/files';
1010
import { ContextKeyExpr, RawContextKey } from 'vs/platform/contextkey/common/contextkey';
1111
import { ITextModelContentProvider } from 'vs/editor/common/services/resolverService';
1212
import { Disposable, MutableDisposable } from 'vs/base/common/lifecycle';
@@ -102,7 +102,7 @@ export const FILE_EDITOR_INPUT_ID = 'workbench.editors.files.fileEditorInput';
102102
export const BINARY_FILE_EDITOR_ID = 'workbench.editors.files.binaryFileEditor';
103103

104104

105-
export interface IFilesConfiguration extends IFilesConfiguration, IWorkbenchEditorConfiguration {
105+
export interface IFilesConfiguration extends PlatformIFilesConfiguration, IWorkbenchEditorConfiguration {
106106
explorer: {
107107
openEditors: {
108108
visible: number;

‎src/vs/workbench/services/workspaces/electron-browser/workspaceEditingService.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ export class NativeWorkspaceEditingService extends AbstractWorkspaceEditingServi
142142
return false;
143143
}
144144
}
145+
146+
return false;
145147
}
146148

147149
async isValidTargetWorkspacePath(path: URI): Promise<boolean> {

0 commit comments

Comments
 (0)