Skip to content

Commit

Permalink
fix: restore preserveConstEnums and import them from vscode
Browse files Browse the repository at this point in the history
  • Loading branch information
Loïc Mangeonjean committed May 30, 2023
1 parent 2461952 commit a8bf1c6
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
3 changes: 2 additions & 1 deletion src/service-override/configuration.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { IConfigurationService } from 'vs/platform/configuration/common/configur
import { ITextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfiguration'
import { TextResourceConfigurationService } from 'vs/editor/common/services/textResourceConfigurationService'
import { SyncDescriptor } from 'vs/platform/instantiation/common/descriptors'
import { IConfigurationRegistry, Extensions as ConfigurationExtensions, ConfigurationScope, IConfigurationNode, IConfigurationDefaults } from 'vs/platform/configuration/common/configurationRegistry'
import { ConfigurationScope } from 'vscode/vs/platform/configuration/common/configurationRegistry'
import { IConfigurationRegistry, Extensions as ConfigurationExtensions, IConfigurationNode, IConfigurationDefaults } from 'vs/platform/configuration/common/configurationRegistry'
import { Registry } from 'vs/platform/registry/common/platform'
import { VSBuffer } from 'vs/base/common/buffer'
import { IFileService } from 'vs/platform/files/common/files'
Expand Down
3 changes: 2 additions & 1 deletion src/service-override/files.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ import { FileService } from 'vs/platform/files/common/fileService'
import { ILogService } from 'vs/platform/log/common/log'
import { InMemoryFileSystemProvider } from 'vs/platform/files/common/inMemoryFilesystemProvider'
import { URI } from 'vs/base/common/uri'
import { createFileSystemProviderError, FileChangeType, FileSystemProviderCapabilities, FileSystemProviderError, FileSystemProviderErrorCode, FileType, IFileChange, IFileDeleteOptions, IFileOverwriteOptions, IFileService, IFileSystemProviderWithFileReadWriteCapability, IFileWriteOptions, IStat, IWatchOptions } from 'vs/platform/files/common/files'
import { FileChangeType, FileSystemProviderCapabilities, FileType } from 'vscode/vs/platform/files/common/files'
import { createFileSystemProviderError, FileSystemProviderError, FileSystemProviderErrorCode, IFileChange, IFileDeleteOptions, IFileOverwriteOptions, IFileService, IFileSystemProviderWithFileReadWriteCapability, IFileWriteOptions, IStat, IWatchOptions } from 'vs/platform/files/common/files'
import { DisposableStore, IDisposable, Disposable } from 'vs/base/common/lifecycle'
import { ITextFileService } from 'vs/workbench/services/textfile/common/textfiles'
import { BrowserTextFileService } from 'vs/workbench/services/textfile/browser/browserTextFileService'
Expand Down
5 changes: 1 addition & 4 deletions src/services.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import Severity from 'vs/base/common/severity'
import { IConfigurationChangeEvent } from 'vs/platform/configuration/common/configuration'
import { ITextModelContentProvider } from 'vs/editor/common/services/resolverService'
import { IColorTheme } from 'vs/platform/theme/common/themeService'
import { StorageScope, StorageTarget } from 'vs/platform/storage/common/storage'
import { StorageScope, StorageTarget } from 'vscode/vs/platform/storage/common/storage'
import { Registry } from 'vs/platform/registry/common/platform'
import { IWorkbenchContributionsRegistry, Extensions as WorkbenchExtensions } from 'vs/workbench/common/contributions'
import { IEditorOverrideServices, StandaloneServices } from 'vs/editor/standalone/browser/standaloneServices'
Expand All @@ -13,9 +13,6 @@ import { RunOnceScheduler, runWhenIdle } from 'vs/base/common/async'
import { Emitter } from 'vs/base/common/event'
import { IAction } from 'vs/base/common/actions'
import getLayoutServiceOverride from './service-override/layout'
// Hack so ContextKeyExprType is included in the bundle as it's used but rollup-plugin-dts is unable to detect it
// https://github.com/Swatinem/rollup-plugin-dts/issues/220
export { ContextKeyExprType } from 'vs/platform/contextkey/common/contextkey'

interface ServiceInitializeParticipant {
(accessor: ServicesAccessor): Promise<void>
Expand Down
3 changes: 2 additions & 1 deletion tsconfig.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@
"monaco-editor/esm/*": [
"./vscode/*"
]
}
},
"preserveConstEnums": true
},
"include": [
"./src/**/*",
Expand Down

0 comments on commit a8bf1c6

Please sign in to comment.