Fixed: LanguageManager shouldn't throw exceptions

[DennisKehrig]

Fix for #2967

[jasonsanjose]

Reviewing

[jasonsanjose]

No need to return promise to the finish callback right?

[DennisKehrig]

Oh, absolutely right!

[jasonsanjose]

Initial review complete

[DennisKehrig]

@jasonsanjose Thanks for the review! I fixed the problems you found.

[DennisKehrig]

@jasonsanjose JSHint doesn't like my code, but JSLint does. Should we configure JSHint with "laxbreak: true" or should I update my code? Not sure how, though, I wouldn't want all this to be in one line:

    if (!language._setId(id)
            || !language._setName(name)
            || (blockComment && !language.setBlockCommentSyntax(blockComment[0], blockComment[1]))
            || (lineComment && !language.setLineCommentSyntax(lineComment))
            ) {

[TomMalbran]

How about this?

if (!language._setId(id) || !language._setName(name) ||
        (blockComment && !language.setBlockCommentSyntax(blockComment[0], blockComment[1])) ||
        (lineComment && !language.setLineCommentSyntax(lineComment))) {

Looks and works in jshint.org and JSLint.

[DennisKehrig]

@TomMalbran Looks good to me, thanks!

[jasonsanjose]

Changes look good. Just need to fix the merge conflict.

[DennisKehrig]

See #3164

[jasonsanjose]

If you omit this change here, will the merge conflicts go away? Raymond is reviewing your other pull.

[DennisKehrig]

How do you mean? Without this change, git thinks I modified the Chinese translation and checks that in - and I don't want to mess anything up this way.

[TomMalbran]

I had the same problem when I merged last night after the translation was merged, but merging again this morning (by removing the translation file) the problem fixed by itself, the translation was properly readded.

[DennisKehrig]

Okay, pulled a fresh master and with that I can now create new branches and check them out without git complaining.

[DennisKehrig]

Supposedly the Chinese translation was changed by this... I'll try rebasing.

[DennisKehrig]

Looking better.

[DennisKehrig]

Purified version - no more messing with .gitattributes. Thanks @TomMalbran!

[jasonsanjose]

Confirmed unit tests pass after trying a test merge with master. Merging. Thanks for your patience @DennisKehrig.