Skip to content

Commit b7afeff

Browse files
committed
More prep for moving completion provider out
1 parent 90f0439 commit b7afeff

16 files changed

Lines changed: 25 additions & 25 deletions

extensions/emmet/src/abbreviationActions.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import parseStylesheet from '@emmetio/css-parser';
99
import parse from '@emmetio/html-matcher';
1010
import Node from '@emmetio/node';
1111
import { getSyntax } from './util';
12-
import { getExpandOptions, extractAbbreviation, isStyleSheet, getNode, getInnerRange } from './emmetForVSCode/emmetUtils';
13-
import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
12+
import { getExpandOptions, extractAbbreviation, isStyleSheet, getNode, getInnerRange } from './vscode-emmet-helper/abbreviationUtil';
13+
import { DocumentStreamReader } from './bufferStream';
1414

1515
export function wrapWithAbbreviation() {
1616
let editor = vscode.window.activeTextEditor;

extensions/emmet/src/balance.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import * as vscode from 'vscode';
77
import parse from '@emmetio/html-matcher';
88
import Node from '@emmetio/node';
9-
import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
10-
import { getNode, isStyleSheet } from './emmetForVSCode/emmetUtils';
9+
import { DocumentStreamReader } from './bufferStream';
10+
import { getNode, isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
1111

1212
export function balanceOut() {
1313
balance(true);
File renamed without changes.

extensions/emmet/src/defaultCompletionProvider.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ import * as vscode from 'vscode';
77
import parseStylesheet from '@emmetio/css-parser';
88
import parse from '@emmetio/html-matcher';
99
import Node from '@emmetio/node';
10-
import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
11-
import { isStyleSheet, getNode, getInnerRange } from './emmetForVSCode/emmetUtils';
12-
import { EmmetCompletionItemProvider } from './emmetForVSCode/emmetCompletionProvider';
10+
import { DocumentStreamReader } from './bufferStream';
11+
import { isStyleSheet, getNode, getInnerRange } from './vscode-emmet-helper/abbreviationUtil';
12+
import { EmmetCompletionItemProvider } from './vscode-emmet-helper/emmetCompletionProvider';
1313
import { isValidLocationForEmmetAbbreviation } from './abbreviationActions';
1414
import { getSyntax } from './util';
1515

extensions/emmet/src/extension.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { toggleComment } from './toggleComment';
1616
import { fetchEditPoint } from './editPoint';
1717
import { fetchSelectItem } from './selectItem';
1818
import { LANGUAGE_MODES, getMappedModes } from './util';
19-
import { updateExtensionsPath } from './emmetForVSCode/emmetUtils';
19+
import { updateExtensionsPath } from './vscode-emmet-helper/abbreviationUtil';
2020

2121
export function activate(context: vscode.ExtensionContext) {
2222
let completionProvider = new DefaultCompletionItemProvider();

extensions/emmet/src/matchTag.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import * as vscode from 'vscode';
77
import parse from '@emmetio/html-matcher';
88
import Node from '@emmetio/node';
9-
import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
10-
import { getNode } from './emmetForVSCode/emmetUtils';
9+
import { DocumentStreamReader } from './bufferStream';
10+
import { getNode } from './vscode-emmet-helper/abbreviationUtil';
1111

1212
export function matchTag() {
1313
let editor = vscode.window.activeTextEditor;

extensions/emmet/src/mergeLines.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
import * as vscode from 'vscode';
77
import parse from '@emmetio/html-matcher';
88
import Node from '@emmetio/node';
9-
import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
10-
import { getNode, isStyleSheet } from './emmetForVSCode/emmetUtils';
9+
import { DocumentStreamReader } from './bufferStream';
10+
import { getNode, isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
1111

1212
export function mergeLines() {
1313
let editor = vscode.window.activeTextEditor;

extensions/emmet/src/selectItem.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ import { nextItemStylesheet, prevItemStylesheet } from './selectItemStylesheet';
1010
import parseStylesheet from '@emmetio/css-parser';
1111
import parse from '@emmetio/html-matcher';
1212
import Node from '@emmetio/node';
13-
import { DocumentStreamReader } from './emmetForVSCode/bufferStream';
14-
import { isStyleSheet } from './emmetForVSCode/emmetUtils';
13+
import { DocumentStreamReader } from './bufferStream';
14+
import { isStyleSheet } from './vscode-emmet-helper/abbreviationUtil';
1515

1616

1717
export function fetchSelectItem(direction: string): void {

extensions/emmet/src/selectItemHTML.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import * as vscode from 'vscode';
77
import { getDeepestNode, findNextWord, findPrevWord } from './util';
88
import Node from '@emmetio/node';
9-
import { getNode } from './emmetForVSCode/emmetUtils';
9+
import { getNode } from './vscode-emmet-helper/abbreviationUtil';
1010

1111

1212
export function nextItemHTML(selectionStart: vscode.Position, selectionEnd: vscode.Position, editor: vscode.TextEditor, rootNode: Node): vscode.Selection {

extensions/emmet/src/selectItemStylesheet.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
import * as vscode from 'vscode';
77
import { getDeepestNode, findNextWord, findPrevWord } from './util';
88
import Node from '@emmetio/node';
9-
import { getNode } from './emmetForVSCode/emmetUtils';
9+
import { getNode } from './vscode-emmet-helper/abbreviationUtil';
1010

1111

1212
export function nextItemStylesheet(startOffset: vscode.Position, endOffset: vscode.Position, editor: vscode.TextEditor, rootNode: Node): vscode.Selection {

0 commit comments

Comments
 (0)