From 06ccc3a5153edfe18139171b424c436a3f780416 Mon Sep 17 00:00:00 2001 From: Benjamin Pasero Date: Sat, 9 Feb 2019 16:49:44 +0100 Subject: [PATCH] debt - move integrity service to workbench --- build/lib/i18n.resources.json | 4 ++++ src/tsconfig.strictNullChecks.json | 4 ++-- .../workbench/contrib/feedback/electron-browser/feedback.ts | 2 +- src/vs/workbench/electron-browser/shell.ts | 4 ++-- src/vs/workbench/electron-browser/window.ts | 2 +- .../services}/integrity/common/integrity.ts | 0 .../services}/integrity/node/integrityServiceImpl.ts | 2 +- 7 files changed, 11 insertions(+), 7 deletions(-) rename src/vs/{platform => workbench/services}/integrity/common/integrity.ts (100%) rename src/vs/{platform => workbench/services}/integrity/node/integrityServiceImpl.ts (98%) diff --git a/build/lib/i18n.resources.json b/build/lib/i18n.resources.json index 6193ef287a3..7343be25ea2 100644 --- a/build/lib/i18n.resources.json +++ b/build/lib/i18n.resources.json @@ -210,6 +210,10 @@ "name": "vs/workbench/services/files", "project": "vscode-workbench" }, + { + "name": "vs/workbench/services/integrity", + "project": "vscode-workbench" + }, { "name": "vs/workbench/services/keybinding", "project": "vscode-workbench" diff --git a/src/tsconfig.strictNullChecks.json b/src/tsconfig.strictNullChecks.json index 1edc3c85e06..4e861eac5cc 100644 --- a/src/tsconfig.strictNullChecks.json +++ b/src/tsconfig.strictNullChecks.json @@ -283,8 +283,6 @@ "./vs/platform/instantiation/test/common/graph.test.ts", "./vs/platform/instantiation/test/common/instantiationService.test.ts", "./vs/platform/instantiation/test/common/instantiationServiceMock.ts", - "./vs/platform/integrity/common/integrity.ts", - "./vs/platform/integrity/node/integrityServiceImpl.ts", "./vs/platform/issue/common/issue.ts", "./vs/platform/issue/electron-main/issueService.ts", "./vs/platform/issue/node/issueIpc.ts", @@ -706,6 +704,8 @@ "./vs/workbench/services/hash/node/hashService.ts", "./vs/workbench/services/history/common/history.ts", "./vs/workbench/services/history/electron-browser/history.ts", + "./vs/workbench/services/integrity/common/integrity.ts", + "./vs/workbench/services/integrity/node/integrityServiceImpl.ts", "./vs/workbench/services/keybinding/common/keybindingIO.ts", "./vs/workbench/services/keybinding/common/keyboardMapper.ts", "./vs/workbench/services/keybinding/common/macLinuxFallbackKeyboardMapper.ts", diff --git a/src/vs/workbench/contrib/feedback/electron-browser/feedback.ts b/src/vs/workbench/contrib/feedback/electron-browser/feedback.ts index 5d3f0f1f67b..11051ef1722 100644 --- a/src/vs/workbench/contrib/feedback/electron-browser/feedback.ts +++ b/src/vs/workbench/contrib/feedback/electron-browser/feedback.ts @@ -11,7 +11,7 @@ import { IContextViewService } from 'vs/platform/contextview/browser/contextView import product from 'vs/platform/node/product'; import * as dom from 'vs/base/browser/dom'; import { ICommandService } from 'vs/platform/commands/common/commands'; -import { IIntegrityService } from 'vs/platform/integrity/common/integrity'; +import { IIntegrityService } from 'vs/workbench/services/integrity/common/integrity'; import { IThemeService, registerThemingParticipant, ITheme, ICssStyleCollector } from 'vs/platform/theme/common/themeService'; import { attachButtonStyler, attachStylerCallback } from 'vs/platform/theme/common/styler'; import { editorWidgetBackground, widgetShadow, inputBorder, inputForeground, inputBackground, inputActiveOptionBorder, editorBackground, buttonBackground, contrastBorder, darken } from 'vs/platform/theme/common/colorRegistry'; diff --git a/src/vs/workbench/electron-browser/shell.ts b/src/vs/workbench/electron-browser/shell.ts index 96060f4ad7f..02380f32f81 100644 --- a/src/vs/workbench/electron-browser/shell.ts +++ b/src/vs/workbench/electron-browser/shell.ts @@ -34,8 +34,8 @@ import { IModelService } from 'vs/editor/common/services/modelService'; import { ModelServiceImpl } from 'vs/editor/common/services/modelServiceImpl'; import { CodeEditorService } from 'vs/workbench/services/editor/browser/codeEditorService'; import { ICodeEditorService } from 'vs/editor/browser/services/codeEditorService'; -import { IntegrityServiceImpl } from 'vs/platform/integrity/node/integrityServiceImpl'; -import { IIntegrityService } from 'vs/platform/integrity/common/integrity'; +import { IntegrityServiceImpl } from 'vs/workbench/services/integrity/node/integrityServiceImpl'; +import { IIntegrityService } from 'vs/workbench/services/integrity/common/integrity'; import { EditorWorkerServiceImpl } from 'vs/editor/common/services/editorWorkerServiceImpl'; import { IEditorWorkerService } from 'vs/editor/common/services/editorWorkerService'; import { ExtensionService } from 'vs/workbench/services/extensions/electron-browser/extensionService'; diff --git a/src/vs/workbench/electron-browser/window.ts b/src/vs/workbench/electron-browser/window.ts index be8f0488a12..1f243734b82 100644 --- a/src/vs/workbench/electron-browser/window.ts +++ b/src/vs/workbench/electron-browser/window.ts @@ -33,7 +33,7 @@ import { RunOnceScheduler } from 'vs/base/common/async'; import { IDisposable, dispose } from 'vs/base/common/lifecycle'; import { LifecyclePhase, ILifecycleService } from 'vs/platform/lifecycle/common/lifecycle'; import { IWorkspaceFolderCreationData } from 'vs/platform/workspaces/common/workspaces'; -import { IIntegrityService } from 'vs/platform/integrity/common/integrity'; +import { IIntegrityService } from 'vs/workbench/services/integrity/common/integrity'; import { AccessibilitySupport, isRootUser, isWindows, isMacintosh, isLinux } from 'vs/base/common/platform'; import product from 'vs/platform/node/product'; import pkg from 'vs/platform/node/package'; diff --git a/src/vs/platform/integrity/common/integrity.ts b/src/vs/workbench/services/integrity/common/integrity.ts similarity index 100% rename from src/vs/platform/integrity/common/integrity.ts rename to src/vs/workbench/services/integrity/common/integrity.ts diff --git a/src/vs/platform/integrity/node/integrityServiceImpl.ts b/src/vs/workbench/services/integrity/node/integrityServiceImpl.ts similarity index 98% rename from src/vs/platform/integrity/node/integrityServiceImpl.ts rename to src/vs/workbench/services/integrity/node/integrityServiceImpl.ts index 25970d2f57f..699851ed92d 100644 --- a/src/vs/platform/integrity/node/integrityServiceImpl.ts +++ b/src/vs/workbench/services/integrity/node/integrityServiceImpl.ts @@ -8,7 +8,7 @@ import * as crypto from 'crypto'; import * as fs from 'fs'; import Severity from 'vs/base/common/severity'; import { URI } from 'vs/base/common/uri'; -import { ChecksumPair, IIntegrityService, IntegrityTestResult } from 'vs/platform/integrity/common/integrity'; +import { ChecksumPair, IIntegrityService, IntegrityTestResult } from 'vs/workbench/services/integrity/common/integrity'; import { ILifecycleService, LifecyclePhase } from 'vs/platform/lifecycle/common/lifecycle'; import product from 'vs/platform/node/product'; import { INotificationService } from 'vs/platform/notification/common/notification';