Skip to content
Permalink
Browse files

Merge branch 'master' of github.com:sagemathinc/cocalc

  • Loading branch information...
williamstein committed Jun 12, 2019
2 parents 85698cb + 3371621 commit bd810b49934ed79a36cbac20304b8944217fff25
@@ -34,10 +34,16 @@ async function tidy(input_path) {
"yes",
"--write-back",
"yes",
// enable it, if we want to show warnings upon exit code == 1
"--show-warnings",
"no", // enable it, if we want to show warnings upon exit code == 1
"no",
"--tidy-mark",
"no",
// https://github.com/sagemathinc/cocalc/issues/3867
"--drop-empty-elements",
"no",
"--drop-empty-paras",
"no",
input_path
];

@@ -2507,6 +2507,8 @@ Options for the 'query' API message must be sent as JSON object.
A query is either _get_ (read from database), or _set_ (write to database).
A query is _get_ if any query keys are null, otherwise the query is _set_.
Note: queries with \`multi_response\` set to \`true\` are not supported.
#### Examples of _get_ query:
Get title and description for a project, given the project id.
@@ -24,7 +24,10 @@ import * as awaiting from "awaiting";
import { three_way_merge } from "../../smc-util/sync/editor/generic/util";

import { KernelInfo } from "./types";
import { Parser, format_parser_for_extension } from "../../smc-util/code-formatter";
import {
Parser,
format_parser_for_extension
} from "../../smc-util/code-formatter";

import { Actions } from "../app-framework";
import {
@@ -2283,7 +2286,7 @@ export class JupyterActions extends Actions<JupyterStoreState> {
return; // no-op on these.
}
try {
const parser : Parser = format_parser_for_extension(ext);
const parser: Parser = format_parser_for_extension(ext);
options = { parser };
} catch (err) {
return; // no parser available.
@@ -29,6 +29,9 @@ export function cm_options(
if (mode.name === "singular") {
mode.name = "clike"; // better than nothing
}
if (mode.name === "ihaskell") {
mode.name = "haskell";
}

const options: any = {
mode,

0 comments on commit bd810b4

Please sign in to comment.
You can’t perform that action at this time.