ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-02-16 18:46:40 -05:00
Code Issues Packages Projects Releases Wiki Activity

Random undefined access (#582)

Browse Source 
* added check for undefined

* formatting

* fix unrelated compile error

* fixed more unrelated compile bugs
This commit is contained in:
Anthony Dresser
2018-01-30 13:33:09 -08:00
committed by GitHub
parent 1b2e264c7d
commit 234c2f7c9e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/sql/services/capabilities/capabilitiesService.ts
View File

@@ -14,7 +14,7 @@ import Event, { Emitter } from 'vs/base/common/event';
import { IAction } from 'vs/base/common/actions'; import { IAction } from 'vs/base/common/actions';
import { Deferred } from 'sql/base/common/promise'; import { Deferred } from 'sql/base/common/promise';
import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil'; import { getGalleryExtensionId } from 'vs/platform/extensionManagement/common/extensionManagementUtil';
import { IExtensionManagementService, ILocalExtension, IExtensionEnablementService, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement'; import { IExtensionManagementService, ILocalExtension, IExtensionEnablementService, LocalExtensionType } from 'vs/platform/extensionManagement/common/extensionManagement';
export const SERVICE_ID = 'capabilitiesService'; export const SERVICE_ID = 'capabilitiesService';
export const HOST_NAME = 'sqlops'; export const HOST_NAME = 'sqlops';
@@ -89,8 +89,8 @@ export class CapabilitiesService implements ICapabilitiesService {
private _registeredCapabilities: number = 0; private _registeredCapabilities: number = 0;
constructor(@IExtensionManagementService private extensionManagementService: IExtensionManagementService, constructor( @IExtensionManagementService private extensionManagementService: IExtensionManagementService,
@IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService) { @IExtensionEnablementService private extensionEnablementService: IExtensionEnablementService) {
this._onProviderRegistered = new Emitter<data.DataProtocolServerCapabilities>(); this._onProviderRegistered = new Emitter<data.DataProtocolServerCapabilities>();
this.disposables.push(this._onProviderRegistered); this.disposables.push(this._onProviderRegistered);
@@ -98,8 +98,8 @@ export class CapabilitiesService implements ICapabilitiesService {
// Get extensions and filter where the category has 'Data Provider' in it // Get extensions and filter where the category has 'Data Provider' in it
this.extensionManagementService.getInstalled(LocalExtensionType.User).then((extensions: ILocalExtension[]) => { this.extensionManagementService.getInstalled(LocalExtensionType.User).then((extensions: ILocalExtension[]) => {
let dataProviderExtensions = extensions.filter(extension => let dataProviderExtensions = extensions.filter(extension =>
extension.manifest.categories.indexOf(CapabilitiesService.DATA_PROVIDER_CATEGORY) > -1); extension.manifest.categories && extension.manifest.categories.indexOf(CapabilitiesService.DATA_PROVIDER_CATEGORY) > -1);
if (dataProviderExtensions.length > 0) { if (dataProviderExtensions.length > 0) {
// Scrape out disabled extensions // Scrape out disabled extensions

2
src/sql/workbench/api/electron-browser/mainThreadModalDialog.ts
View File

@@ -5,7 +5,7 @@
'use strict'; 'use strict';
import { WebViewDialog } from 'sql/base/browser/ui/modal/webViewDialog'; import { WebViewDialog } from 'sql/base/browser/ui/modal/webViewDialog';
import { MainThreadModalDialogShape, SqlMainContext, SqlExtHostContext, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlextHost.protocol'; import { MainThreadModalDialogShape, SqlMainContext, SqlExtHostContext, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol'; import { IExtHostContext } from 'vs/workbench/api/node/extHost.protocol';
import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers'; import { extHostNamedCustomer } from 'vs/workbench/api/electron-browser/extHostCustomers';
import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService'; import { IWorkbenchEditorService } from 'vs/workbench/services/editor/common/editorService';

2
src/sql/workbench/api/node/extHostModalDialog.ts
View File

@@ -4,7 +4,7 @@
*--------------------------------------------------------------------------------------------*/ *--------------------------------------------------------------------------------------------*/
'use strict'; 'use strict';
import { SqlMainContext, MainThreadModalDialogShape, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlextHost.protocol'; import { SqlMainContext, MainThreadModalDialogShape, ExtHostModalDialogsShape } from 'sql/workbench/api/node/sqlExtHost.protocol';
import { IMainContext } from 'vs/workbench/api/node/extHost.protocol'; import { IMainContext } from 'vs/workbench/api/node/extHost.protocol';
import * as vscode from 'vscode'; import * as vscode from 'vscode';
import * as data from 'data'; import * as data from 'data';