Skip to content

Commit 6af6797

Browse files
author
Brad Cornes
committed
move some utils
1 parent 39733ae commit 6af6797

File tree

7 files changed

+13
-6
lines changed

7 files changed

+13
-6
lines changed

src/lsp/providers/completionProvider.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,15 +15,15 @@ import { isCssContext } from '../util/css'
1515
import { findLast, findJsxStrings, arrFindLast } from '../util/find'
1616
import { stringifyConfigValue, stringifyCss } from '../util/stringify'
1717
import { stringifyScreen, Screen } from '../util/screens'
18-
import isObject from '../util/isObject'
18+
import isObject from '../../util/isObject'
1919
import * as emmetHelper from 'vscode-emmet-helper-bundled'
2020
import { isValidLocationForEmmetAbbreviation } from '../util/isValidLocationForEmmetAbbreviation'
2121
import { getDocumentSettings } from '../util/getDocumentSettings'
2222
import { isJsContext } from '../util/js'
2323
import { naturalExpand } from '../util/naturalExpand'
2424
import semver from 'semver'
2525
import { docsUrl } from '../util/docsUrl'
26-
import { ensureArray } from '../util/array'
26+
import { ensureArray } from '../../util/array'
2727

2828
function completionsFromClassList(
2929
state: State,

src/lsp/util/color.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ const dlv = require('dlv')
22
import { State } from './state'
33
import removeMeta from './removeMeta'
44
import { TinyColor } from '@ctrl/tinycolor'
5-
import { ensureArray, dedupe, flatten } from './array'
5+
import { ensureArray, dedupe, flatten } from '../../util/array'
66

77
const COLOR_PROPS = [
88
'caret-color',

src/lsp/util/removeMeta.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import isObject from './isObject'
1+
import isObject from '../../util/isObject'
22

33
export default function removeMeta(obj: any): any {
44
let result = {}

src/lsp/util/screens.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import isObject from './isObject'
1+
import isObject from '../../util/isObject'
22

33
export type MinMaxScreen = {
44
min?: string

src/lsp/util/stringify.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import removeMeta from './removeMeta'
22
const dlv = require('dlv')
33
import escapeClassName from 'css.escape'
4-
import { ensureArray } from './array'
4+
import { ensureArray } from '../../util/array'
55

66
export function stringifyConfigValue(x: any): string {
77
if (typeof x === 'string') return x

src/lsp/util/array.ts renamed to src/util/array.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,3 +9,10 @@ export function ensureArray<T>(value: T | T[]): T[] {
99
export function flatten<T>(arrays: T[][]): T[] {
1010
return [].concat.apply([], arrays)
1111
}
12+
13+
export function equal(arr1: any[], arr2: any[]): boolean {
14+
return (
15+
JSON.stringify(arr1.concat([]).sort()) ===
16+
JSON.stringify(arr2.concat([]).sort())
17+
)
18+
}
File renamed without changes.

0 commit comments

Comments
 (0)