ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-03-30 16:50:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

More layering (#6541)

Browse Source 
* layer unlayered code; fix layering

* readd os

* fix definition of recommended extensions

* protect against tests
This commit is contained in:
Anthony Dresser
2019-07-31 22:20:39 -07:00
committed by GitHub
parent 161c182a56
commit 9bfe8813b1
38 changed files with 77 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/vs/workbench/contrib/extensions/browser/extensionsViews.ts
View File

@@ -48,8 +48,6 @@ import { IProductService } from 'vs/platform/product/common/product';
import { SeverityIcon } from 'vs/platform/severityIcon/common/severityIcon';
import { IContextKeyService } from 'vs/platform/contextkey/common/contextkey';
import product from 'vs/platform/product/node/product'; // {{SQL CARBON EDIT}}
class ExtensionsViewState extends Disposable implements IExtensionsViewState {
@@ -429,15 +427,17 @@ export class ExtensionsListView extends ViewletPanel {
}
// {{SQL CARBON EDIT}}
let promiseRecommendedExtensionsByScenario;
Object.keys(product.recommendedExtensionsByScenario).forEach(scenarioType => {
let re = new RegExp('@' + scenarioType, 'i');
if (re.test(query.value)) {
promiseRecommendedExtensionsByScenario = this.getRecommendedExtensionsByScenario(token, scenarioType);
if (this.productService) {
let promiseRecommendedExtensionsByScenario: Promise<IPagedModel<IExtension>> | undefined;
Object.keys(this.productService.recommendedExtensionsByScenario).forEach(scenarioType => {
let re = new RegExp('@' + scenarioType, 'i');
if (re.test(query.value)) {
promiseRecommendedExtensionsByScenario = this.getRecommendedExtensionsByScenario(token, scenarioType);
}
});
if (promiseRecommendedExtensionsByScenario) {
return promiseRecommendedExtensionsByScenario;
}
});
if (promiseRecommendedExtensionsByScenario) {
return promiseRecommendedExtensionsByScenario;
}
// {{SQL CARBON EDIT}} - End

6
src/vs/workbench/contrib/extensions/electron-browser/extensionTipsService.ts
View File

@@ -18,8 +18,8 @@ import product from 'vs/platform/product/node/product';
import { IInstantiationService } from 'vs/platform/instantiation/common/instantiation';
// {{SQL CARBON EDIT}}
import { ShowRecommendedExtensionsAction, InstallWorkspaceRecommendedExtensionsAction, InstallRecommendedExtensionAction } from 'vs/workbench/contrib/extensions/browser/extensionsActions';
import { ShowRecommendedExtensionsByScenarioAction, InstallRecommendedExtensionsByScenarioAction } from 'sql/workbench/contrib/extensions/extensionsActions';
import * as Constants from 'sql/workbench/contrib/extensions/constants';
import { ShowRecommendedExtensionsByScenarioAction, InstallRecommendedExtensionsByScenarioAction } from 'sql/workbench/contrib/extensions/common/extensionsActions';
import * as Constants from 'sql/workbench/contrib/extensions/common/constants';
// {{SQL CARBON EDIT}} - End
import Severity from 'vs/base/common/severity';
import { IWorkspaceContextService, IWorkspaceFolder, IWorkspace, IWorkspaceFoldersChangeEvent, WorkbenchState } from 'vs/platform/workspace/common/workspace';
@@ -50,7 +50,7 @@ import { extname } from 'vs/base/common/resources';
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles';
import { IExeBasedExtensionTip } from 'vs/platform/product/common/product';
import { timeout } from 'vs/base/common/async';
import { IAdsTelemetryService } from 'sql/platform/telemetry/telemetry';
import { IAdsTelemetryService } from 'sql/platform/telemetry/common/telemetry';
import * as TelemetryKeys from 'sql/platform/telemetry/common/telemetryKeys';
const milliSecondsInADay = 1000 * 60 * 60 * 24;