Skip to content

Commit

Permalink
Merge pull request #5476 from welfuture/develop
Browse files Browse the repository at this point in the history
chore: remove repetitive words
  • Loading branch information
sidharthv96 authored Apr 26, 2024
2 parents 47c5abb + 273941a commit d316b05
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 8 deletions.
2 changes: 1 addition & 1 deletion packages/mermaid/src/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ export const updateCurrentConfig = (siteCfg: MermaidConfig, _directives: Mermaid
let sumOfDirectives: MermaidConfig = {};
for (const d of _directives) {
sanitize(d);
// Apply the data from the directive where the the overrides the themeVariables
// Apply the data from the directive where the overrides the themeVariables
sumOfDirectives = assignWithDepth(sumOfDirectives, d);
}

Expand Down
2 changes: 1 addition & 1 deletion packages/mermaid/src/dagre-wrapper/GraphObjects.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ flowchart
a --> C2
```

To handle this case a special type of edge is inserted. The edge to/from the cluster is replaced with an edge to/from a node in the cluster which is tagged with toCluster/fromCluster. When rendering this edge the intersection between the edge and the border of the cluster is calculated making the edge start/stop there. In practice this renders like an an edge to/from the cluster.
To handle this case a special type of edge is inserted. The edge to/from the cluster is replaced with an edge to/from a node in the cluster which is tagged with toCluster/fromCluster. When rendering this edge the intersection between the edge and the border of the cluster is calculated making the edge start/stop there. In practice this renders like an edge to/from the cluster.

In the diagram above the root diagram would be rendered with C1 whereas C2 would be rendered recursively.

Expand Down
2 changes: 1 addition & 1 deletion packages/mermaid/src/dagre-wrapper/intersect/index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*
* Borrowed with love from from dagre-d3. Many thanks to cpettitt!
* Borrowed with love from dagre-d3. Many thanks to cpettitt!
*/

import node from './intersect-node.js';
Expand Down
2 changes: 1 addition & 1 deletion packages/mermaid/src/diagrams/block/blockDB.ts
Original file line number Diff line number Diff line change
Expand Up @@ -262,7 +262,7 @@ const getBlocksFlat = () => {
return [...Object.values(blockDatabase)];
};
/**
* Returns the the hierarchy of blocks
* Returns the hierarchy of blocks
* @returns
*/
const getBlocks = () => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ describe('when parsing flowcharts', function () {
expect(edges[3].type).toBe('arrow_point');
expect(edges[3].text).toBe('');
});
it('should handle chaining and multiple nodes in in link statement FVC ', function () {
it('should handle chaining and multiple nodes in link statement FVC ', function () {
const res = flow.parser.parse(`
graph TD
A --> B & B2 & C --> D2;
Expand Down Expand Up @@ -181,7 +181,7 @@ describe('when parsing flowcharts', function () {
expect(edges[5].type).toBe('arrow_point');
expect(edges[5].text).toBe('');
});
it('should handle chaining and multiple nodes in in link statement with extra info in statements', function () {
it('should handle chaining and multiple nodes in link statement with extra info in statements', function () {
const res = flow.parser.parse(`
graph TD
A[ h ] -- hello --> B[" test "]:::exClass & C --> D;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ describe('parsing a flow chart', function () {
expect(edges[0].end).toBe('monograph');
});

describe('special characters should be be handled.', function () {
describe('special characters should be handled.', function () {
const charTest = function (char, result) {
const res = flow.parser.parse('graph TD;A(' + char + ')-->B;');

Expand Down
2 changes: 1 addition & 1 deletion packages/mermaid/src/diagrams/state/stateDb.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ const getRootDocV2 = () => {
* Ex: the section within a fork has its own statements, and incoming and outgoing statements
* refer to the fork as a whole (document).
* See the parser grammar: the definition of a document is a document then a 'line', where a line can be a statement.
* This will push the statement into the the list of statements for the current document.
* This will push the statement into the list of statements for the current document.
*
* @param _doc
*/
Expand Down

0 comments on commit d316b05

Please sign in to comment.