Skip to content

Commit

Permalink
Text/Stack: Fix issue where key documentation pieces were missing (mi…
Browse files Browse the repository at this point in the history
…crosoft#8198)

* Fix issue 8197

* Change files

* Minor fix
  • Loading branch information
cliffkoh authored and dzearing committed Mar 6, 2019
1 parent bf912f0 commit 699e460
Show file tree
Hide file tree
Showing 7 changed files with 31 additions and 6 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/example-app-base",
"comment": "Improve autodoc to deal with line breaks in extends clause.",
"type": "patch"
}
],
"packageName": "@uifabric/example-app-base",
"email": "cliff.koh@microsoft.com"
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"changes": [
{
"packageName": "@uifabric/experiments",
"comment": "Clean up a few imports.",
"type": "patch"
}
],
"packageName": "@uifabric/experiments",
"email": "cliff.koh@microsoft.com"
}
7 changes: 5 additions & 2 deletions packages/example-app-base/src/utilities/parser/Parse.ts
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,10 @@ export function parse(source: string, propsInterfaceOrEnumName?: string): IPrope
const escapedSource = source.replace(/\\(?!\\)/g, '');

if (propsInterfaceOrEnumName) {
regex = new RegExp(`^export (interface|(?:const )?enum) ${propsInterfaceOrEnumName}(?:\\s*extends .*?)? \\{( |.*[\\r\\n]*)*?\\}`, 'm');
regex = new RegExp(
`^export (interface|(?:const )?enum) ${propsInterfaceOrEnumName}(?:\\s+extends\\s+(?:.|\\s)*?)? \\{( |.*[\\r\\n]*)*?\\}`,
'm'
);
let regexResult = regex.exec(escapedSource);
if (regexResult && regexResult.length > 0) {
parseInfo = _parseEnumOrInterface(regexResult);
Expand All @@ -46,7 +49,7 @@ export function parse(source: string, propsInterfaceOrEnumName?: string): IPrope
];
}
} else {
regex = new RegExp(`^export (interface|(?:const )?enum) (\\S*?)(?:\\s*extends .*?)? \\{( |.*[\\r\\n]*)*?\\}`, 'gm');
regex = new RegExp(`^export (interface|(?:const )?enum) (\\S*?)(?:\\s+extends\\s+(?:.|\\s)*?)? \\{( |.*[\\r\\n]*)*?\\}`, 'gm');
let regexResult: RegExpExecArray | null;
let results: Array<IProperty> = [];
while ((regexResult = regex.exec(escapedSource)) !== null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
import * as React from 'react';
/* tslint:enable:no-unused-variable */
import { BaseComponent } from 'office-ui-fabric-react/lib/Utilities';
import { createListItems } from '@uifabric/example-app-base/lib/utilities/data';
import { createListItems } from '@uifabric/example-app-base';
import { IColumn, DetailsList, buildColumns, SelectionMode, Toggle, IDetailsRowProps, DetailsRow } from 'office-ui-fabric-react';
import { Shimmer } from '@uifabric/experiments/lib/Shimmer';
import './Shimmer.Example.scss';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import * as React from 'react';
import { Tile, getTileLayout, renderTileWithLayout } from '@uifabric/experiments/lib/Tile';
import { Checkbox } from 'office-ui-fabric-react/lib/Checkbox';
import { SignalField, NewSignal, CommentsSignal, TrendingSignal, SharedSignal } from '../../signals/Signals';
import { lorem } from '@uifabric/example-app-base/lib/utilities/data';
import { lorem } from '@uifabric/example-app-base';
import { css, ISize, fitContentToBounds } from '@uifabric/experiments/lib/Utilities';
import * as TileExampleStylesModule from './Tile.Example.scss';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { Tile } from '../Tile';
import { Checkbox } from 'office-ui-fabric-react/lib/Checkbox';
import { SignalField, NewSignal, CommentsSignal, SharedSignal } from '../../signals/Signals';
import { FolderCover, getFolderCoverLayout, renderFolderCoverWithLayout, FolderCoverType } from '@uifabric/experiments/lib/FolderCover';
import { lorem } from '@uifabric/example-app-base/lib/utilities/data';
import { lorem } from '@uifabric/example-app-base';
import { css, ISize, fitContentToBounds } from '@uifabric/experiments/lib/Utilities';
import * as TileExampleStylesModule from './Tile.Example.scss';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import { Icon } from 'office-ui-fabric-react/lib/Icon';
import { Checkbox } from 'office-ui-fabric-react/lib/Checkbox';
import { css, ISize, fitContentToBounds } from '@uifabric/experiments/lib/Utilities';
import { SignalField, Signal, NewSignal, SharedSignal, MentionSignal } from '../../signals/Signals';
import { lorem } from '@uifabric/example-app-base/lib/utilities/data';
import { lorem } from '@uifabric/example-app-base';
import * as TileExampleStylesModule from './Tile.Example.scss';

const ITEMS: { name: string; activity: string }[] = [
Expand Down

0 comments on commit 699e460

Please sign in to comment.