Skip to content
This repository was archived by the owner on Sep 6, 2021. It is now read-only.
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions src/LiveDevelopment/LiveDevelopment.js
Original file line number Diff line number Diff line change
Expand Up @@ -245,10 +245,11 @@ define(function LiveDevelopment(require, exports, module) {
* @param {Document} document
*/
function _classForDocument(doc) {
switch (doc.getLanguage().getId()) {
case "css":
var language = doc.getLanguage();
if (language.isInstanceOfLanguage("css")) {
return CSSDocument;
case "javascript":
}
if (language.isInstanceOfLanguage("javascript")) {
return exports.config.experimental ? JSDocument : null;
}

Expand Down
2 changes: 1 addition & 1 deletion src/editor/CSSInlineEditor.js
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ define(function (require, exports, module) {
*/
function htmlToCSSProvider(hostEditor, pos) {
// Only provide a CSS editor when cursor is in HTML content
if (hostEditor.getLanguageForSelection().getId() !== "html") {
if (!hostEditor.getLanguageForSelection().isInstanceOfLanguage("html")) {
return null;
}

Expand Down
8 changes: 4 additions & 4 deletions src/editor/CodeHintManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -285,11 +285,11 @@ define(function (require, exports, module) {
* Return the array of hint providers for the given language id.
* This gets called (potentially) on every keypress. So, it should be fast.
*
* @param {!string} languageId
* @param {!Language} language
* @return {?Array.<{provider: Object, priority: number}>}
*/
function _getProvidersForLanguageId(languageId) {
return hintProviders[languageId] || hintProviders.all;
function _getProvidersForLanguage(language) {
return language.findEntryInObject(hintProviders) || hintProviders.all;
}

/**
Expand Down Expand Up @@ -375,7 +375,7 @@ define(function (require, exports, module) {
function _beginSession(editor) {
// Find a suitable provider, if any
var language = editor.getLanguageForSelection(),
enabledProviders = _getProvidersForLanguageId(language.getId());
enabledProviders = _getProvidersForLanguage(language);

enabledProviders.some(function (item, index) {
if (item.provider.hasHints(editor, lastChar)) {
Expand Down
2 changes: 1 addition & 1 deletion src/extensions/default/JSLint/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ define(function (require, exports, module) {

var language = currentDoc ? LanguageManager.getLanguageForPath(currentDoc.file.fullPath) : "";

if (_enabled && language && language.getId() === "javascript") {
if (_enabled && language && language.isInstanceOfLanguage("javascript")) {
perfTimerLint = PerfUtils.markStart("JSLint linting:\t" + (!currentDoc || currentDoc.file.fullPath));
var text = currentDoc.getText();

Expand Down
4 changes: 2 additions & 2 deletions src/extensions/default/JavaScriptCodeHints/HintUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@ define(function (require, exports, module) {
});
}

function isSupportedLanguage(languageId) {
return SUPPORTED_LANGUAGES.indexOf(languageId) !== -1;
function isSupportedLanguage(language) {
return language.isInstanceOfLanguageInArray(SUPPORTED_LANGUAGES);
}
var KEYWORD_NAMES = [
"break", "case", "catch", "continue", "debugger", "default", "delete",
Expand Down
4 changes: 2 additions & 2 deletions src/extensions/default/JavaScriptCodeHints/ScopeManager.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,8 +200,8 @@ define(function (require, exports, module) {
if (fileCallback && entry.isFile) {

if (file.indexOf(".") > 0) { // ignore .dotfiles
var languageID = LanguageManager.getLanguageForPath(path).getId();
if (languageID === HintUtils.LANGUAGE_ID) {
var language = LanguageManager.getLanguageForPath(path);
if (language.isInstanceOfLanguage(HintUtils.LANGUAGE_ID)) {
fileCallback(path);
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/extensions/default/JavaScriptCodeHints/Session.js
Original file line number Diff line number Diff line change
Expand Up @@ -504,7 +504,7 @@ define(function (require, exports, module) {
* @return {string} - the "javascript" text that can be sent to Tern.
*/
Session.prototype.getJavascriptText = function () {
if (LanguageManager.getLanguageForPath(this.editor.document.file.fullPath).getId() === "html") {
if (this.editor.document.getLanguage().isInstanceOfLanguage("html")) {
// HTML file - need to send back only the bodies of the
// <script> tags
var text = "",
Expand Down
9 changes: 4 additions & 5 deletions src/extensions/default/JavaScriptCodeHints/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -239,13 +239,12 @@ define(function (require, exports, module) {
/**
* @return {boolean} - true if the document is a html file
*/
function isHTMLFile(document) {
var languageID = LanguageManager.getLanguageForPath(document.file.fullPath).getId();
return languageID === "html";
function isHTMLFile(doc) {
return doc.getLanguage().isInstanceOfLanguage("html");
}

function isInlineScript(editor) {
return editor.getModeForSelection() === "javascript";
return editor.getLanguageForSelection().isInstanceOfLanguage("javascript");
}

/**
Expand Down Expand Up @@ -470,7 +469,7 @@ define(function (require, exports, module) {
cachedHints = null;
cachedType = null;

if (editor && HintUtils.isSupportedLanguage(LanguageManager.getLanguageForPath(editor.document.file.fullPath).getId())) {
if (editor && HintUtils.isSupportedLanguage(LanguageManager.getLanguageForPath(editor.document.file.fullPath))) {
initializeSession(editor, true);
} else {
session = null;
Expand Down
2 changes: 1 addition & 1 deletion src/extensions/default/WebPlatformDocs/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ define(function (require, exports, module) {
*/
function inlineProvider(hostEditor, pos) {
// Only provide docs when cursor is in CSS content
if (hostEditor.getLanguageForSelection().getId() !== "css") {
if (!hostEditor.getLanguageForSelection().isInstanceOfLanguage("css")) {
return null;
}

Expand Down
Loading