Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into roblou/runButton
Browse files Browse the repository at this point in the history
  • Loading branch information
rebornix committed Mar 19, 2020
2 parents 95ba0b1 + a67cde2 commit edaee26
Show file tree
Hide file tree
Showing 106 changed files with 3,066 additions and 614 deletions.
3 changes: 2 additions & 1 deletion extensions/vscode-account/src/AADHelper.ts
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,8 @@ export class AzureActiveDirectoryService {
const query = parseQuery(uri);
const code = query.code;

if (query.state !== state) {
// Workaround double encoding issues of state in web
if (query.state !== state && decodeURIComponent(query.state) !== state) {
throw new Error('State does not match.');
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import * as assert from 'assert';
import { join } from 'path';
import { commands, workspace, window, Uri, Range, Position, ViewColumn } from 'vscode';

suite('commands namespace tests', () => {
suite('vscode API - commands', () => {

test('getCommands', function (done) {

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import 'mocha';
import * as assert from 'assert';
import * as vscode from 'vscode';

suite('Configuration tests', () => {
suite('vscode API - configuration', () => {

test('configurations, language defaults', function () {
const defaultLanguageSettings = vscode.workspace.getConfiguration().get('[abcLang]');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { debug, workspace, Disposable, commands, window } from 'vscode';
import { disposeAll } from '../utils';
import { basename } from 'path';

suite('Debug', function () {
suite('vscode API - debug', function () {

test('breakpoints', async function () {
assert.equal(debug.breakpoints.length, 0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import * as assert from 'assert';
import { workspace, window, Position, Range, commands, TextEditor, TextDocument, TextEditorCursorStyle, TextEditorLineNumbersStyle, SnippetString, Selection, Uri } from 'vscode';
import { createRandomFile, deleteFile, closeAllEditors } from '../utils';

suite('editor tests', () => {
suite('vscode API - editors', () => {

teardown(closeAllEditors);

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import * as assert from 'assert';
import { env, extensions, ExtensionKind, UIKind, Uri } from 'vscode';

suite('env-namespace', () => {
suite('vscode API - env', () => {

test('env is set', function () {
assert.equal(typeof env.language, 'string');
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import { join } from 'path';
import * as vscode from 'vscode';
import { createRandomFile, testFs } from '../utils';

suite('languages namespace tests', () => {
suite('vscode API - languages', () => {

const isWindows = process.platform === 'win32';

Expand Down
Loading

0 comments on commit edaee26

Please sign in to comment.