opensource/code-server
1
0
Fork 0
mirror of https://github.com/coder/code-server.git synced 2025-07-31 22:13:52 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove unused deep merge code

Browse Source
This commit is contained in:
Asher
2020-08-04 15:12:15 -05:00
parent 150d37868a
commit f7790c9719
3 changed files with 4 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/node/settings.ts
View File

@ -1,6 +1,6 @@
import * as fs from "fs-extra"
import * as path from "path"
import { extend, paths } from "./util"
import { paths } from "./util"
import { logger } from "@coder/logger"
import { Route } from "./http"
@ -30,12 +30,12 @@ export class SettingsProvider<T> {
/**
* Write settings combined with current settings. On failure log a warning.
* Settings can be shallow or deep merged.
* Settings will be merged shallowly.
*/
public async write(settings: Partial<T>, shallow = true): Promise<void> {
public async write(settings: Partial<T>): Promise<void> {
try {
const oldSettings = await this.read()
const nextSettings = shallow ? Object.assign({}, oldSettings, settings) : extend(oldSettings, settings)
const nextSettings = { ...oldSettings, ...settings }
await fs.writeFile(this.settingsPath, JSON.stringify(nextSettings, null, 2))
} catch (error) {
logger.warn(error.message)