Skip to content

Commit

Permalink
Merge branch 'typescript-vue-dts-support' of https://github.com/sande…
Browse files Browse the repository at this point in the history
…rsn/vetur into typescript-vue-dts-support
  • Loading branch information
sandersn committed Mar 20, 2017
2 parents 144bf54 + a5a3387 commit b496266
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions server/src/modes/javascriptMode.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@ import { SymbolInformation, SymbolKind, CompletionItem, Location, SignatureHelp,
import { LanguageMode } from './languageModes';
import { getWordAtText, isWhitespaceOnly, repeat } from '../utils/strings';
import { HTMLDocumentRegions } from './embeddedSupport';
import Uri from 'vscode-uri';
import path = require('path');

import { createUpdater, parseVue, isVue } from './typescriptMode';

import Uri from 'vscode-uri';
import path = require('path');
import * as ts from 'typescript';

const JS_WORD_REGEX = /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g;
Expand Down

0 comments on commit b496266

Please sign in to comment.