Cleanup code duplication

This commit is contained in:
Vishesh Handa
2021-03-18 15:05:53 +01:00
parent f6f0f5a9a6
commit 4b52e5061a
2 changed files with 5 additions and 17 deletions

View File

@ -1,11 +1,8 @@
import 'package:flutter/foundation.dart'; import 'package:flutter/foundation.dart';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_markdown/flutter_markdown.dart';
import 'package:markdown/markdown.dart' as md;
import 'package:provider/provider.dart'; import 'package:provider/provider.dart';
import 'package:gitjournal/core/link.dart';
import 'package:gitjournal/core/note.dart'; import 'package:gitjournal/core/note.dart';
import 'package:gitjournal/core/notes_folder.dart'; import 'package:gitjournal/core/notes_folder.dart';
import 'package:gitjournal/core/notes_folder_fs.dart'; import 'package:gitjournal/core/notes_folder_fs.dart';
@ -53,15 +50,6 @@ class NoteViewer extends StatelessWidget {
return view; return view;
} }
static md.ExtensionSet markdownExtensions() {
// It's important to add both these inline syntaxes before the other
// syntaxes as the LinkSyntax intefers with both of these
var markdownExtensions = md.ExtensionSet.gitHubFlavored;
markdownExtensions.inlineSyntaxes.insert(0, WikiLinkSyntax());
markdownExtensions.inlineSyntaxes.insert(1, TaskListSyntax());
return markdownExtensions;
}
/* /*
Widget _buildFooter(BuildContext context) { Widget _buildFooter(BuildContext context) {
return Padding( return Padding(

View File

@ -1,7 +1,7 @@
import 'package:markdown/markdown.dart' as md; import 'package:markdown/markdown.dart' as md;
import 'package:test/test.dart'; import 'package:test/test.dart';
import 'package:gitjournal/widgets/note_viewer.dart'; import 'package:gitjournal/widgets/markdown_renderer.dart';
void main() { void main() {
test('Parses Wiki Lnks and task items', () { test('Parses Wiki Lnks and task items', () {
@ -10,8 +10,8 @@ void main() {
var doc = md.Document( var doc = md.Document(
encodeHtml: false, encodeHtml: false,
extensionSet: NoteViewer.markdownExtensions(), extensionSet: MarkdownRenderer.markdownExtensions(),
inlineSyntaxes: NoteViewer.markdownExtensions().inlineSyntaxes, inlineSyntaxes: MarkdownRenderer.markdownExtensions().inlineSyntaxes,
); );
var nodes = doc.parseLines(lines); var nodes = doc.parseLines(lines);
@ -30,8 +30,8 @@ void main() {
var doc = md.Document( var doc = md.Document(
encodeHtml: false, encodeHtml: false,
extensionSet: NoteViewer.markdownExtensions(), extensionSet: MarkdownRenderer.markdownExtensions(),
inlineSyntaxes: NoteViewer.markdownExtensions().inlineSyntaxes, inlineSyntaxes: MarkdownRenderer.markdownExtensions().inlineSyntaxes,
); );
var nodes = doc.parseLines(lines); var nodes = doc.parseLines(lines);